scrollpane widget, updated chatbox

1 files changed, 19 insertions, 15 deletions

diff --git a/src/ui/widget.cc b/src/ui/widget.cc
index 606c4ab..046cb01 100644
--- a/src/ui/widget.cc
+++ b/src/ui/widget.cc
@@ -200,7 +200,7 @@ void Widget::set_size(float const w, float const h)
 	widget_size.assign(w, h);
 }
 
-void Widget::set_size(math::Vector2f const &size)
+void Widget::set_size(const math::Vector2f &size)
 {
 	widget_size.assign(size);
 }
@@ -329,7 +329,13 @@ void Widget::event_draw()
 {
 	if (!visible())
 		return;
-		
+	
+	if (widget_background)
+		draw_background();
+	if (widget_border)
+		draw_border();
+	if (debug())
+		draw_debug_border();
 	draw();
 	
 	for (Children::iterator it = widget_children.begin(); it != widget_children.end(); it++) {
@@ -371,32 +377,30 @@ bool Widget::on_keyrelease(const int key, const unsigned int modifier)
 
 /* -- draw functions ----------------------------------------------- */
 
-void Widget::resize()
-{
-}
-
-void Widget::draw()
+void Widget::draw_debug_border()
 {
-	draw_background();
-	draw_border();
+	paint::color(1.0f, 0.0f, 1.0f, 0.5f);
+	paint::border(global_location(), size());
 }
 
 void Widget::draw_background()
 {
-	if (!widget_background)
-		return;
-		
 	paint::color(palette()->background());
 	paint::rectangle(global_location(), size());
 }
 
 void Widget::draw_border()
 {
-	if (!widget_border)
-		return;
-		
 	paint::color(palette()->border());
 	paint::border(global_location(), size());
 }
 
+void Widget::draw()
+{
+}
+
+void Widget::resize()
+{
+}
+
 }