X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdropdown.cpp;h=41e42fa72fa4b45b399ede99167d3a45d0bbe869;hb=815194201203afd6fa59e650e1007a355c829544;hp=e9634f5e676f781675c646c9e0d4f3a65a9841c5;hpb=2bdaf4955fdb94e73704adcdcf0adc2b353f0ff0;p=libs%2Fgltk.git

diff --git a/source/dropdown.cpp b/source/dropdown.cpp
index e9634f5..41e42fa 100644
--- a/source/dropdown.cpp
+++ b/source/dropdown.cpp
@@ -1,15 +1,9 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/gl/font.h>
 #include "dropdown.h"
 #include "list.h"
 #include "panel.h"
 #include "part.h"
+#include "root.h"
 #include "style.h"
 #include "text.h"
 
@@ -23,30 +17,47 @@ Dropdown::Dropdown():
 {
 	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));
+}
+
+void Dropdown::autosize()
+{
+	if(!style)
+		return;
+
+	Widget::autosize();
+	geom.w = max(geom.w, list.get_geometry().w);
+
+	if(const Part *text_part = style->get_part("text"))
+	{
+		const Sides &margin = text_part->get_margin();
+		const GL::Font &font = style->get_font();
+		float font_size = style->get_font_size();
+		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);
+	}
+
+	rebuild();
 }
 
 void Dropdown::append(const string &item)
 {
 	list.append(item);
-	resize_list();
 }
 
 void Dropdown::insert(unsigned i, const string &v)
 {
 	list.insert(i, v);
-	resize_list();
 }
 
 void Dropdown::remove(unsigned i)
 {
 	list.remove(i);
-	resize_list();
 }
 
 void Dropdown::clear()
 {
 	list.clear();
-	resize_list();
 }
 
 unsigned Dropdown::get_n_items() const
@@ -69,15 +80,21 @@ int Dropdown::get_selected_index() const
 	return list.get_selected_index();
 }
 
-void Dropdown::render_special(const Part &part) const
+void Dropdown::rebuild_special(const Part &part, CachedPart &cache)
 {
 	if(part.get_name()=="text")
 	{
 		if(list.get_selected_index()>=0)
-			Text(*style, list.get_selected()).render(part, geom);
+			Text(*style, list.get_selected()).build(part, geom, cache);
+		else
+			cache.texture = 0;
 	}
-	else if(part.get_name()=="list" && dropped)
-		list.render();
+}
+
+void Dropdown::render_special(const Part &part, GL::Renderer &renderer) const
+{
+	if(part.get_name()=="list" && dropped)
+		list.render(renderer);
 }
 
 void Dropdown::button_press(int x, int y, unsigned btn)
@@ -88,14 +105,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();
 	}
 }
@@ -110,11 +127,40 @@ void Dropdown::on_style_change()
 	resize_list();
 }
 
+void Dropdown::list_autosize_changed()
+{
+	resize_list();
+	signal_autosize_changed.emit();
+}
+
 void Dropdown::resize_list()
 {
-	list.autosize();
-	const Geometry &lgeom = list.get_geometry();
-	list.set_geometry(Geometry(0, -lgeom.h, max(geom.w, lgeom.w), lgeom.h));
+	list.autosize_all();
+	Geometry lgeom = list.get_geometry();
+	lgeom.x = 0;
+	lgeom.y = -lgeom.h;
+	lgeom.w = max(geom.w, lgeom.w);
+	int root_x = geom.x;
+	int root_y = geom.y;
+	for(Widget *p=parent; p; p=p->get_parent())
+	{
+		root_x += p->get_geometry().x;
+		root_y += p->get_geometry().y;
+		if(Root *root = dynamic_cast<Root *>(p))
+		{
+			const Geometry &rgeom = root->get_geometry();
+			if(lgeom.h*2>rgeom.h)
+				lgeom.h = rgeom.h/2;
+			if(root_y+lgeom.y<0)
+				lgeom.y = -root_y;
+			if(root_y+lgeom.y+lgeom.h>rgeom.h)
+				lgeom.y = rgeom.h-lgeom.h-root_y;
+			if(root_x+lgeom.x+lgeom.w>rgeom.w)
+				lgeom.x = rgeom.w-lgeom.w-root_x;
+			break;
+		}
+	}
+	list.set_geometry(lgeom);
 }
 
 void Dropdown::list_item_selected(unsigned index, const std::string &item)
@@ -122,7 +168,7 @@ void Dropdown::list_item_selected(unsigned index, const std::string &item)
 	if(dropped)
 	{
 		dropped = false;
-		state &= ~ACTIVE;
+		clear_state(ACTIVE);
 		signal_ungrab_pointer.emit();
 	}
 
@@ -138,7 +184,7 @@ Dropdown::Loader::Loader(Dropdown &d):
 
 void Dropdown::Loader::item(const string &str)
 {
-	dynamic_cast<Dropdown &>(wdg).append(str);
+	dynamic_cast<Dropdown &>(obj).append(str);
 }
 
 } // namespace GLtk