X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=e1538dec221bedc9a190c5904421ce6e1d16d87c;hb=a38c924ff32081f5cd67c2b0e2d5ca61f0e99de2;hp=48ae0eda4b042b3e4096a2d7f494d3ea77db2e44;hpb=c1f038acb91eb3bfaa34dfd4729d19ed3f871a42;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index 48ae0ed..e1538de 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -44,37 +44,22 @@ void Widget::render() const
 	GL::pop_matrix();
 }
 
-bool Widget::button_press(int x, int y, unsigned btn)
-{
-	if(x>=geom.x && y>=geom.y && x<geom.x+static_cast<int>(geom.w) && y<geom.y+static_cast<int>(geom.h))
-	{
-		on_button_press(x, y, btn);
-		return true;
-	}
-
-	return false;
-}
-
-bool Widget::button_release(int x, int y, unsigned btn)
-{
-	if(x>=geom.x && y>=geom.y && x<geom.x+static_cast<int>(geom.w) && y<geom.y+static_cast<int>(geom.h))
-	{
-		on_button_release(x, y, btn);
-		return true;
-	}
-
-	return false;
-}
-
 Widget::Widget(const Resources &r):
 	res(r),
 	style(0),
-	state(NORMAL)
+	state(NORMAL),
+	visible(true)
 { }
 
 void Widget::update_style()
 {
-	style=&res.get_style(get_class(), style_name);
+	string sname=get_class();
+	if(!style_name.empty())
+	{
+		sname+='-';
+		sname+=style_name;
+	}
+	style=res.get<Style>(sname);
 }
 
 void Widget::render_part(const Part &part) const
@@ -98,10 +83,10 @@ void Widget::render_text(const Part &part, const string &text) const
 
 	GL::push_matrix();
 
-	part.get_alignment().apply(geom, text_w, static_cast<unsigned>(font_size));
+	part.get_alignment().apply(geom, text_w, static_cast<unsigned>(font->get_ascent()*font_size));
 	GL::scale_uniform(font_size);
 
-	const Color &color=style->get_font_color();
+	const GL::Color &color=style->get_font_color();
 	glColor3f(color.r, color.g, color.b);
 	font->draw_string(text);
 	glColor3f(1, 1, 1);
@@ -109,5 +94,30 @@ void Widget::render_text(const Part &part, const string &text) const
 	GL::pop_matrix();
 }
 
+
+Widget::Loader::Loader(Widget &w):
+	wdg(w)
+{
+	add("position", &Loader::position);
+	add("size",     &Loader::size);
+	add("style",    &Loader::style);
+	add("visible",  &Widget::visible);
+}
+
+void Widget::Loader::position(int x, int y)
+{
+	wdg.set_position(x, y);
+}
+
+void Widget::Loader::size(unsigned w, unsigned h)
+{
+	wdg.set_size(w, h);
+}
+
+void Widget::Loader::style(const string &s)
+{
+	wdg.set_style(s);
+}
+
 } // namespace GLtk
 } // namespace Msp