X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=2af3b60b3024a96e5689637ed152e152b2eec275;hb=ae991f3bbd83fa0afff5e1fc31be50e1f2d17875;hp=7137260a297165442e0554011b0334ef0149a6d1;hpb=1e06dc208a02e68cf1bb127927e3ad5af3657c58;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index 7137260..2af3b60 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -23,6 +23,7 @@ Widget::Widget(const Resources &r):
 	style(0),
 	state(NORMAL),
 	visible(true),
+	focusable(true),
 	parent(0)
 { }
 
@@ -34,27 +35,27 @@ Widget::~Widget()
 
 void Widget::set_position(int x, int y)
 {
-	geom.x=x;
-	geom.y=y;
+	geom.x = x;
+	geom.y = y;
 	on_geometry_change();
 }
 
 void Widget::set_size(unsigned w, unsigned h)
 {
-	geom.w=w;
-	geom.h=h;
+	geom.w = w;
+	geom.h = h;
 	on_geometry_change();
 }
 
 void Widget::set_geometry(const Geometry &g)
 {
-	geom=g;
+	geom = g;
 	on_geometry_change();
 }
 
 void Widget::set_style(const string &s)
 {
-	style_name=s;
+	style_name = s;
 	update_style();
 }
 
@@ -68,11 +69,16 @@ void Widget::set_visible(bool v)
 	if(v==visible)
 		return;
 
-	visible=v;
+	visible = v;
 
 	signal_visibility_changed.emit(visible);
 }
 
+void Widget::set_focusable(bool f)
+{
+	focusable = f;
+}
+
 void Widget::set_focus()
 {
 	if(!parent)
@@ -97,72 +103,41 @@ void Widget::render() const
 			GL::PushMatrix push_;
 			i->render(geom, state);
 		}
-			//render_graphic(*i);
 		else
 			render_special(*i);
 	}
 	GL::pop_matrix();
 }
 
-/*void Widget::render_graphic(const Part &part) const
-{
-	GL::push_matrix();
-	part.render(geom, state);
-	GL::pop_matrix();
-}
-
-void Widget::render_text(const Part &part, const string &text) const
-{
-	const GL::Font *const font=style->get_font();
-	const float font_size=font->get_default_size();
-
-	Geometry rgeom;
-	rgeom.w=static_cast<unsigned>(font->get_string_width(text)*font_size);
-	rgeom.h=static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
-	rgeom.y=static_cast<int>(-font->get_descent()*font_size);
-	part.get_alignment().apply(rgeom, geom, part.get_margin());
-
-	GL::push_matrix();
-	GL::translate(rgeom.x, rgeom.y, 0);
-	GL::scale_uniform(font_size);
-
-	const GL::Color &color=style->get_font_color();
-	GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
-	imm.color(color.r, color.g, color.b);
-	font->draw_string(text, imm);
-
-	GL::pop_matrix();
-}*/
-
 void Widget::pointer_enter()
 {
-	state|=HOVER;
+	state |= HOVER;
 }
 
 void Widget::pointer_leave()
 {
-	state&=~HOVER;
+	state &= ~HOVER;
 }
 
 void Widget::focus_in()
 {
-	state|=FOCUS;
+	state |= FOCUS;
 }
 
 void Widget::focus_out()
 {
-	state&=~FOCUS;
+	state &= ~FOCUS;
 }
 
 void Widget::update_style()
 {
-	string sname=get_class();
+	string sname = get_class();
 	if(!style_name.empty())
 	{
-		sname+='-';
-		sname+=style_name;
+		sname += '-';
+		sname += style_name;
 	}
-	style=res.get<Style>(sname);
+	style = res.get<Style>(sname);
 	on_style_change();
 }
 
@@ -170,7 +145,7 @@ void Widget::set_parent(Container *p)
 {
 	if(parent && p)
 		throw InvalidState("Widget is already in a Container");
-	parent=p;
+	parent = p;
 
 	on_reparent();
 }