From b492615fb68e5c97fce87bcc946e92f115cfc3a2 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sat, 30 Jul 2011 13:36:45 +0000 Subject: Added support for tiled ui materials, changed default widget backgrounds to use ui materials. --- src/ui/widget.cc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/ui/widget.cc') diff --git a/src/ui/widget.cc b/src/ui/widget.cc index de18e6b..540fd6c 100644 --- a/src/ui/widget.cc +++ b/src/ui/widget.cc @@ -407,16 +407,19 @@ void Widget::event_draw() if (widget_background) draw_background(); - if (widget_border) - draw_border(); - if (debug()) - draw_debug(); - draw(); for (Children::iterator it = widget_children.begin(); it != widget_children.end(); it++) { if ((*it)->visible()) (*it)->event_draw(); } + + if (widget_border) + draw_border(); + + if (debug()) + draw_debug(); + + draw(); } void Widget::event_resize() @@ -465,8 +468,9 @@ void Widget::draw_debug() void Widget::draw_background() { - Paint::set_color(palette()->background()); - Paint::draw_rectangle(global_location(), size()); + //Paint::set_color(palette()->background()); + //Paint::draw_rectangle(global_location(), size()); + Paint::draw_material(global_location(), size(), "ui/background"); } void Widget::draw_border() -- cgit v1.2.3