From 4331f5c17901f46693dcb5c2df96276f6851be25 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Wed, 8 Oct 2008 18:28:21 +0000
Subject: libui updates, paint namespace, font and palette fixes, button sound

---
 src/ui/ui.cc | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

(limited to 'src/ui/ui.cc')

diff --git a/src/ui/ui.cc b/src/ui/ui.cc
index 94daf03..2b09938 100644
--- a/src/ui/ui.cc
+++ b/src/ui/ui.cc
@@ -168,14 +168,32 @@ void shutdown()
 
 UI::UI() : Window(0)
 {
-	set_palette(&ui_palette);
 	set_label("root");
 	set_size(1024, 768);
 	set_border(false);
 
+	// default palette
+	ui_palette = new Palette();
+	set_palette(ui_palette);
+
+	// default fonts
+	ui_font_small = new Font("gui", 12, 18);
+	ui_font_medium = new Font("gui", 14, 24);
+	ui_font_large = new Font("gui", 16, 30);
+	set_font(ui_font_small);
+
 	load();
 }
 
+UI::~UI()
+{
+	delete ui_palette;
+
+	delete ui_font_small;
+	delete ui_font_medium;
+	delete ui_font_large;
+}
+
 void UI::load()
 {
 	Windows::iterator it;
@@ -237,16 +255,16 @@ void UI::load()
 			} else if (ini.in_section("colors")) {
 
 				if (ini.got_key_color("foreground", color)) {
-					ui_palette.set_foreground(color);
+					ui_palette->set_foreground(color);
 					continue;
 				} else if (ini.got_key_color("highlight", color)) {
-					ui_palette.set_highlight(color);
+					ui_palette->set_highlight(color);
 					continue;
 				} else if (ini.got_key_color("background", color)) {
-					ui_palette.set_background(color);
+					ui_palette->set_background(color);
 					continue;
 				} else if (ini.got_key_color("border", color)) {
-					ui_palette.set_border(color);
+					ui_palette->set_border(color);
 					continue;
 				} else {
 					ini.unkown_key();
@@ -277,10 +295,6 @@ void UI::load()
 	}
 }
 
-UI::~UI()
-{
-}
-
 void UI::list()
 {
 	size_t n = Widget::list(0);
@@ -301,6 +315,7 @@ void UI::add_window(Window *window)
 {
 	Window::add_window(window);
 	window->hide();
+	window->set_font(ui_font_medium);
 }
 
 void UI::remove_window(Window *window)
-- 
cgit v1.2.3