Changeset 26 for trunk/Classes/help.cpp

Timestamp:

2010-05-28 07:39:52 (2 years ago)

Author:

kpoole

Message:

Episode 5

File:

• trunk/Classes/help.cpp (modified) (7 diffs)

trunk/Classes/help.cpp

@@ -341 +341 @@
 
 protected:
+    virtual void handle_event(const SDL_Event& event);
     virtual void scroll(unsigned int pos);
     virtual void set_inner_location(const SDL_Rect& rect);
@@ -2021 +2022 @@
         std::string to_show = items_it->visible_string;
         if (selected_item_ == *items_it)
-            to_show = std::string("*") + to_show;
+            to_show = std::string("") + DEFAULT_ITEM + to_show;
         menu_items.push_back(to_show);
     }
@@ -2579 +2580 @@
 }
 
+void help_text_area::handle_event(const SDL_Event& event)
+{
+    handle_drag_event(event);
+}
+    
 void help_text_area::scroll(unsigned int)
 {
@@ -2619 +2625 @@
     back_topics_(),
     forward_topics_(),
-    back_button_(disp.video(), _(" < Back"), gui::button::TYPE_PRESS),
-    forward_button_(disp.video(), _("Forward >"), gui::button::TYPE_PRESS),
+    back_button_(disp.video(), _(" < Back"), gui::button::TYPE_PRESS, "button"),
+    forward_button_(disp.video(), _("Forward >"), gui::button::TYPE_PRESS, "button"),
     shown_topic_(NULL)
 {
@@ -2631 +2637 @@
 #ifdef __IPHONEOS__
     //set_measurements(font::relative_size(200), font::relative_size(320));
-    set_measurements(480, 320);
+    #ifdef __IPAD__
+        set_measurements(1024, 768);
+    #else
+        set_measurements(480, 320);
+    #endif
 #else   
     set_measurements(font::relative_size(400), font::relative_size(500));
@@ -3123 +3133 @@
 
 #ifdef __IPHONEOS__
-    const int width  = 480;
-    const int height = 280;
+    #ifdef __IPAD__
+        const int width  = 1024;
+        const int height = 768-55;
+    #else
+        const int width  = 480;
+        const int height = 280;
+    #endif
 #else
     const int width  = std::min<int>(font::relative_size(900), screen.x() - font::relative_size(20));
@@ -3141 +3156 @@
     }
     std::vector<gui::button*> buttons_ptr;
-    gui::button close_button_(disp.video(), _("Close"));
+    gui::button close_button_(disp.video(), _("Close"), gui::button::TYPE_PRESS, "button");
     buttons_ptr.push_back(&close_button_);