Use the maximum item height for autosizing List

[libs/gltk.git] / source / list.cpp

diff --git a/source/list.cpp b/source/list.cpp
index a9cbcc1c5f02af4080ca895f18525dfcea61af1e..005f6fa8ea29cc2a57cd23152f46167dacf922a1 100644 (file)
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -2,6 +2,7 @@
 #include <msp/debug/demangle.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/meshbuilder.h>
+#include <msp/input/keys.h>
 #include "graphic.h"
 #include "list.h"
 #include "part.h"
@@ -70,18 +71,16 @@ void List::autosize_special(const Part &part, Geometry &ageom) const
                const Sides &margin = part.get_margin();
 
                unsigned max_w = 0;
-               unsigned total_h = 0;
+               unsigned max_h = 0;
                for(unsigned i=0; i<items.size(); ++i)
                {
                        Geometry igeom;
                        items[i]->autosize(igeom);
                        max_w = max(max_w, igeom.w);
-                       if(view_size==0 || i<view_size)
-                               total_h += igeom.h;
+                       max_h = max(max_h, igeom.h);
                }
 
-               if(!items.empty() && items.size()<view_size)
-                       total_h = total_h*view_size/items.size();
+               unsigned total_h = max_h*(view_size==0 ? items.size() : view_size);
 
                ageom.w = max(ageom.w, max_w+margin.left+margin.right);
                ageom.h = max(ageom.h, total_h+margin.top+margin.bottom);
@@ -234,6 +233,18 @@ void List::render_special(const Part &part, GL::Renderer &renderer) const
                slider.render(renderer);
 }
 
+bool List::key_press(unsigned key, unsigned mod)
+{
+       if(key==Input::KEY_UP && mod==MOD_CTRL)
+               move_focus(NAV_UP, false);
+       else if(key==Input::KEY_DOWN && mod==MOD_CTRL)
+               move_focus(NAV_DOWN, false);
+       else
+               return false;
+
+       return true;
+}
+
 void List::button_press(int x, int y, unsigned btn)
 {
        if(btn==4 || btn==5)
@@ -328,22 +339,31 @@ void List::focus_in()
 
 bool List::navigate(Navigation nav)
 {
-       if(nav==NAV_UP && !items.empty())
+       if((nav==NAV_UP || nav==NAV_DOWN) && !items.empty())
+               move_focus(nav, true);
+       else if(nav==NAV_ACTIVATE)
+               set_selected_index(focus_index);
+       else
+               return false;
+
+       return true;
+}
+
+void List::move_focus(Navigation nav, bool select)
+{
+       if(nav==NAV_UP)
        {
                if(focus_index>0)
                        set_focus_index(focus_index-1);
        }
-       else if(nav==NAV_DOWN && !items.empty())
+       else if(nav==NAV_DOWN)
        {
                if(static_cast<unsigned>(focus_index+1)<items.size())
                        set_focus_index(focus_index+1);
        }
-       else if(nav==NAV_ACTIVATE)
-               set_selected_index(focus_index);
-       else
-               return false;
 
-       return true;
+       if(select)
+               set_selected_index(focus_index);
 }
 
 void List::set_focus_index(int i)