X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdropdown.cpp;h=68c1beed1321fea803981b36701246576273a397;hb=9f38197854e699a6093a906ab43f4238f3cd2388;hp=50aced9fe9fcaafd4317884ea4b370caa2395b03;hpb=b61361ee9f1f049fb3c22a38f68c757c7ca54cd0;p=libs%2Fgltk.git

diff --git a/source/dropdown.cpp b/source/dropdown.cpp
index 50aced9..68c1bee 100644
--- a/source/dropdown.cpp
+++ b/source/dropdown.cpp
@@ -25,19 +25,22 @@ Dropdown::Dropdown(ListData &d):
 
 void Dropdown::init()
 {
-	dropped = false;
+	input_type = INPUT_NAVIGATION;
 
 	add(list);
+	list.set_visible(false);
 	list.set_view_all();
 	list.signal_item_selected.connect(sigc::mem_fun(this, &Dropdown::list_item_selected));
+	list.signal_selection_cleared.connect(sigc::mem_fun(this, &Dropdown::list_selection_cleared));
 	list.signal_autosize_changed.connect(sigc::mem_fun(this, &Dropdown::list_autosize_changed));
 }
 
-void Dropdown::autosize_special(const Part &part, Geometry &ageom)
+void Dropdown::autosize_special(const Part &part, Geometry &ageom) const
 {
 	if(part.get_name()=="list")
 	{
-		list.autosize();
+		Geometry lgeom;
+		list.autosize(lgeom);
 		ageom.w = max(ageom.w, list.get_geometry().w);
 	}
 	else if(part.get_name()=="text")
@@ -58,15 +61,6 @@ void Dropdown::autosize_special(const Part &part, Geometry &ageom)
 		unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font_size);
 		ageom.h = max(ageom.h, line_height+margin.top+margin.bottom);
 	}
-
-	rebuild();
-}
-
-void Dropdown::set_selected_index(int index)
-{
-	list.set_selected_index(index);
-	if(index<0)
-		text.set(string());
 }
 
 void Dropdown::rebuild_special(const Part &part)
@@ -89,41 +83,71 @@ void Dropdown::button_press(int x, int y, unsigned btn)
 	{
 		Container::button_press(x, y, btn);
 		if(!click_focus)
-		{
-			dropped = false;
-			clear_state(ACTIVE);
-			signal_ungrab_pointer.emit();
-		}
+			close_list();
 	}
 	else if(btn==1)
+		open_list();
+}
+
+bool Dropdown::navigate(Navigation nav)
+{
+	if(dropped)
 	{
-		dropped = true;
-		set_state(ACTIVE);
-		signal_grab_pointer.emit();
+		if(nav==NAV_CANCEL)
+			close_list();
+		else
+			list.navigate(nav);
 	}
+	else if(nav==NAV_ACTIVATE)
+		open_list();
+	else
+		return false;
+
+	return true;
 }
 
-void Dropdown::on_geometry_change()
+void Dropdown::on_size_change()
 {
-	resize_list();
+	if(dropped)
+		resize_list();
 }
 
 void Dropdown::on_style_change()
 {
 	text.set_style(style);
+	if(dropped)
+		resize_list();
+}
+
+void Dropdown::open_list()
+{
+	dropped = true;
+	list.set_visible(true);
 	resize_list();
+	set_state(ACTIVE);
+	set_input_focus(&list);
+	signal_grab_pointer.emit();
+}
+
+void Dropdown::close_list()
+{
+	dropped = false;
+	list.set_visible(false);
+	clear_state(ACTIVE);
+	signal_ungrab_pointer.emit();
 }
 
 void Dropdown::list_autosize_changed()
 {
-	resize_list();
+	if(dropped)
+		resize_list();
 	signal_autosize_changed.emit();
 }
 
 void Dropdown::resize_list()
 {
-	list.autosize();
-	Geometry lgeom = list.get_geometry();
+	Geometry lgeom;
+	list.autosize(lgeom);
 	lgeom.x = 0;
 	lgeom.y = -lgeom.h;
 	lgeom.w = max(geom.w, lgeom.w);
@@ -137,7 +161,10 @@ void Dropdown::resize_list()
 		{
 			const Geometry &rgeom = root->get_geometry();
 			if(lgeom.h*2>rgeom.h)
+			{
 				lgeom.h = rgeom.h/2;
+				lgeom.y = -lgeom.h;
+			}
 			if(root_y+lgeom.y<0)
 				lgeom.y = -root_y;
 			if(root_y+lgeom.y+lgeom.h>rgeom.h)
@@ -162,7 +189,12 @@ void Dropdown::list_item_selected(unsigned index)
 	text.set(list.get_data().get_string(index));
 
 	signal_item_selected.emit(index);
-	rebuild();
+	mark_rebuild();
+}
+
+void Dropdown::list_selection_cleared()
+{
+	text.set(string());
 }