From 9d39702824e8fae5127e09fb5a05b521b48cd028 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 9 Nov 2008 11:43:28 +0000 Subject: docking menus --- src/ui/container.cc | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'src/ui/container.cc') diff --git a/src/ui/container.cc b/src/ui/container.cc index 977ff4d..915ec98 100644 --- a/src/ui/container.cc +++ b/src/ui/container.cc @@ -7,6 +7,7 @@ #include "ui/container.h" #include "ui/paint.h" +#include "ui/ui.h" namespace ui { @@ -19,9 +20,6 @@ Container::Container(Widget *parent) : Window(parent) set_border(true); set_background(true); - - container_childsize.assign(256, 48); - container_margin = 24; } Container::~Container() @@ -30,31 +28,22 @@ Container::~Container() void Container::resize() { - float w = container_childsize.width() * 1.5f; - float h = children().size() * (container_childsize.height() + margin()) + container_childsize.height(); + float w = UI::elementsize.width() * 1.5f; + float h = children().size() * (UI::elementsize.height() + UI::elementmargin) + UI::elementsize.height(); set_size(w, h); - const float x = container_childsize.width() * 0.25f; - float y = container_childsize.height() * 0.5f; + const float x = UI::elementsize.width() * 0.25f; + float y = UI::elementsize.height() * 0.5f; // reposition all children within the container for (Children::iterator it = children().begin(); it != children().end(); it++) { Widget *w = (*it); - w->set_size(container_childsize); + w->set_size(UI::elementsize); w->set_location(x, y); - y += container_childsize.height() + container_margin; + y += UI::elementsize.height() + UI::elementmargin; } } -void Container::set_childsize(const float w, const float h) -{ - container_childsize.assign(w, h); -} - -void Container::set_margin(const float margin) -{ - container_margin = margin; -} void Container::draw_border() { -- cgit v1.2.3