X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdropdown.cpp;h=ddf5c9268500479655796caecf9bad0a1ec71e20;hb=319cde3c06181ba1c3619567525002926d8b4889;hp=cab6d918e536210190a256b67b7965c0851c2f1b;hpb=4ab33a06c9f8a85b193d7db8bc6ee9b8895aab09;p=libs%2Fgltk.git

diff --git a/source/dropdown.cpp b/source/dropdown.cpp
index cab6d91..ddf5c92 100644
--- a/source/dropdown.cpp
+++ b/source/dropdown.cpp
@@ -12,9 +12,21 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Dropdown::Dropdown():
-	dropped(false)
+Dropdown::Dropdown()
 {
+	init();
+}
+
+Dropdown::Dropdown(ListData &d):
+	list(d)
+{
+	init();
+}
+
+void Dropdown::init()
+{
+	dropped = false;
+
 	add(list);
 	list.signal_item_selected.connect(sigc::mem_fun(this, &Dropdown::list_item_selected));
 	list.signal_autosize_changed.connect(sigc::mem_fun(this, &Dropdown::list_autosize_changed));
@@ -26,6 +38,7 @@ void Dropdown::autosize()
 		return;
 
 	Widget::autosize();
+	list.autosize_all();
 	geom.w = max(geom.w, list.get_geometry().w);
 
 	if(const Part *text_part = style->get_part("text"))
@@ -33,60 +46,42 @@ void Dropdown::autosize()
 		const Sides &margin = text_part->get_margin();
 		const GL::Font &font = style->get_font();
 		float font_size = style->get_font_size();
+
+		unsigned max_w = 0;
+		const ListData &data = list.get_data();
+		for(unsigned i=0; i<data.size(); ++i)
+		{
+			unsigned w = static_cast<unsigned>(font.get_string_width(data.get_string(i))*font_size);
+			max_w = max(max_w, w);
+		}
+		geom.w = max(geom.w, max_w+margin.left+margin.right);
+
 		unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font_size);
 		geom.h = max(geom.h, line_height+margin.top+margin.bottom);
 	}
-}
-
-void Dropdown::append(const string &item)
-{
-	list.append(item);
-}
-
-void Dropdown::insert(unsigned i, const string &v)
-{
-	list.insert(i, v);
-}
-
-void Dropdown::remove(unsigned i)
-{
-	list.remove(i);
-}
 
-void Dropdown::clear()
-{
-	list.clear();
-}
-
-unsigned Dropdown::get_n_items() const
-{
-	return list.get_n_items();
+	rebuild();
 }
 
-void Dropdown::set_selected_index(int i)
+void Dropdown::set_selected_index(int index)
 {
-	list.set_selected_index(i);
+	list.set_selected_index(index);
+	if(index<0)
+		text.set(string());
 }
 
-const string &Dropdown::get_selected() const
+void Dropdown::rebuild_special(const Part &part)
 {
-	return list.get_selected();
-}
-
-int Dropdown::get_selected_index() const
-{
-	return list.get_selected_index();
+	if(part.get_name()=="text")
+		text.build(part, geom, part_cache);
+	else
+		Widget::rebuild_special(part);
 }
 
-void Dropdown::render_special(const Part &part) const
+void Dropdown::render_special(const Part &part, GL::Renderer &renderer) const
 {
-	if(part.get_name()=="text")
-	{
-		if(list.get_selected_index()>=0)
-			Text(*style, list.get_selected()).render(part, geom);
-	}
-	else if(part.get_name()=="list" && dropped)
-		list.render();
+	if(part.get_name()=="list" && dropped)
+		list.render(renderer);
 }
 
 void Dropdown::button_press(int x, int y, unsigned btn)
@@ -97,14 +92,14 @@ void Dropdown::button_press(int x, int y, unsigned btn)
 		if(!click_focus)
 		{
 			dropped = false;
-			state &= ~ACTIVE;
+			clear_state(ACTIVE);
 			signal_ungrab_pointer.emit();
 		}
 	}
 	else if(btn==1)
 	{
 		dropped = true;
-		state |= ACTIVE;
+		set_state(ACTIVE);
 		signal_grab_pointer.emit();
 	}
 }
@@ -116,6 +111,7 @@ void Dropdown::on_geometry_change()
 
 void Dropdown::on_style_change()
 {
+	text.set_style(style);
 	resize_list();
 }
 
@@ -155,28 +151,31 @@ void Dropdown::resize_list()
 	list.set_geometry(lgeom);
 }
 
-void Dropdown::list_item_selected(unsigned index, const std::string &item)
+void Dropdown::list_item_selected(unsigned index)
 {
 	if(dropped)
 	{
 		dropped = false;
-		state &= ~ACTIVE;
+		clear_state(ACTIVE);
 		signal_ungrab_pointer.emit();
 	}
 
-	signal_item_selected.emit(index, item);
+	text.set(list.get_data().get_string(index));
+
+	signal_item_selected.emit(index);
+	rebuild();
 }
 
 
 Dropdown::Loader::Loader(Dropdown &d):
-	Widget::Loader(d)
+	DataFile::DerivedObjectLoader<Dropdown, Widget::Loader>(d)
 {
 	add("item", &Loader::item);
 }
 
-void Dropdown::Loader::item(const string &str)
+void Dropdown::Loader::item(const string &v)
 {
-	dynamic_cast<Dropdown &>(obj).append(str);
+	dynamic_cast<BasicListData<string> &>(obj.list.get_data()).append(v);
 }
 
 } // namespace GLtk