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

diff --git a/source/dropdown.cpp b/source/dropdown.cpp
index 34ca178..68c1bee 100644
--- a/source/dropdown.cpp
+++ b/source/dropdown.cpp
@@ -25,7 +25,7 @@ Dropdown::Dropdown(ListData &d):
 
 void Dropdown::init()
 {
-	dropped = false;
+	input_type = INPUT_NAVIGATION;
 
 	add(list);
 	list.set_visible(false);
@@ -83,24 +83,30 @@ void Dropdown::button_press(int x, int y, unsigned btn)
 	{
 		Container::button_press(x, y, btn);
 		if(!click_focus)
-		{
-			dropped = false;
-			list.set_visible(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;
-		list.set_visible(true);
-		resize_list();
-		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()
 {
 	if(dropped)
 		resize_list();
@@ -113,6 +119,24 @@ void Dropdown::on_style_change()
 		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()
 {
 	if(dropped)
@@ -165,7 +189,7 @@ 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()