Changeset 26 for trunk/Classes/widgets/menu.cpp

Timestamp:

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

Author:

kpoole

Message:

Episode 5

File:

• trunk/Classes/widgets/menu.cpp (modified) (12 diffs)

trunk/Classes/widgets/menu.cpp

@@ -26 +26 @@
 #include "video.hpp"
 #include "wml_separators.hpp"
+
+#include "construct_dialog.hpp"
 
 #include <numeric>
@@ -288 +290 @@
 void menu::update_scrollbar_grip_height()
 {
-    set_full_size(items_.size());
-    set_shown_size(max_items_onscreen());
+    //set_full_size(items_.size());
+    int h = heading_height();
+    for(int i = 0; i < items_.size(); i++)
+        h += get_item_height(i);    
+    set_full_size(h);
+    size_t max_height = (max_height_ == -1 ? (video().gety()*88)/100 : max_height_) - heading_height();
+    if (max_height > h)
+        max_height = h;
+    set_shown_size(max_height);
 }
 
@@ -315 +324 @@
     }
 
+    //update_scrollbar_grip_height();
+    //set_measurements(w, h);
+    size_t max_height = (max_height_ == -1 ? (video().gety()*88)/100 : max_height_) - heading_height();
+    h = heading_height();
+    for(int i = 0; i < items_.size(); i++)
+        h += get_item_height(i);    
+
+    if (max_height > h)
+        max_height = h;
+    set_measurements(w, max_height);
     update_scrollbar_grip_height();
-    set_measurements(w, h);
 }
 
@@ -442 +460 @@
     const size_t max_height = (max_height_ == -1 ? (video().gety()*88)/100 : max_height_) - heading_height();
 #else
-    const size_t max_height = (max_height_ == -1 ? (video().gety()*66)/100 : max_height_) - heading_height();
+    const size_t max_height = (max_height_ == -1 ? (video().gety()*88)/100 : max_height_) - heading_height();
 #endif
 
@@ -467 +485 @@
     if(click_selects_)
         return;
-    adjust_position(selected_);
+    //adjust_position(selected_);
+    adjust_position(selected_ * item_height_);
 }
 
@@ -603 +622 @@
     if (height()==0 || hidden())
         return;
+    
+
+    if (scrollarea::handle_drag_event(event) == true)
+        return;
 
     if(event.type == SDL_KEYDOWN) {
@@ -609 +632 @@
             key_press(event.key.keysym.sym);
     } else if(!mouse_locked() && ((event.type == SDL_MOUSEBUTTONUP &&
-             (event.button.button == SDL_BUTTON_LEFT || event.button.button == SDL_BUTTON_RIGHT)) ||
-             event.type == DOUBLE_CLICK_EVENT)) {
+             (event.button.button == SDL_BUTTON_LEFT || event.button.button == SDL_BUTTON_RIGHT)) 
+//                                || event.type == DOUBLE_CLICK_EVENT
+                                  )) {
 
         int x = 0;
@@ -882 +906 @@
             xpos -= widths[i];
         if(type == HEADING_ROW && highlight_heading_ == int(i)) {
-            draw_solid_tinted_rectangle(xpos,rect.y,widths[i],rect.h,255,255,255,0.3); //,video().getSurface());
+            //draw_solid_tinted_rectangle(xpos,rect.y,widths[i],rect.h,255,255,255,0.3); //,video().getSurface());
         }
 
@@ -942 +966 @@
 void menu::draw_contents()
 {
+    
+    // KP: now draw a nice frame!
+    SDL_Rect frame_rect = inner_location();
+    gui::dialog_frame f(video(), "", gui::dialog_frame::preview_style, false);
+    f.layout(frame_rect);
+//  f.draw_background();
+    f.draw_border();
+    
+    
     SDL_Rect heading_rect = inner_location();
     heading_rect.h = heading_height();
     style_->draw_row(*this,0,heading_rect,HEADING_ROW);
+    
+    // KP: make sure to clip
+    SDL_Rect content_rect = inner_location();
+    content_rect.y += heading_rect.h;
+    content_rect.h -= heading_rect.h;
+    clip_rect_setter clippy(content_rect);
+    
 
     for(size_t i = 0; i != item_pos_.size(); ++i) {
@@ -985 +1025 @@
 
     bg_restore();
+    
+    
+    
 
     util::scoped_ptr<clip_rect_setter> clipper(NULL);
@@ -1085 +1128 @@
 SDL_Rect menu::get_item_rect_internal(size_t item) const
 {
-    unsigned int first_item_on_screen = get_position();
+    //unsigned int first_item_on_screen = get_position();
+    unsigned int first_item_on_screen = get_position() / item_height_;
+    unsigned int leftovers = get_position() - (first_item_on_screen * item_height_);
     if (item < first_item_on_screen ||
-        size_t(item) >= first_item_on_screen + max_items_onscreen()) {
+        size_t(item) >= first_item_on_screen + max_items_onscreen() + 2) {
         return empty_rect;
     }
@@ -1101 +1146 @@
         const SDL_Rect& prev = get_item_rect_internal(item-1);
         y = prev.y + prev.h;
+    }
+    else
+    {
+        // KP: sub-item scrolling
+        y -= leftovers;
     }