libui updates, support menu .ini files

1 files changed, 3 insertions, 6 deletions

diff --git a/src/ui/window.cc b/src/ui/window.cc
index 8763b53..60fbf56 100644
--- a/src/ui/window.cc
+++ b/src/ui/window.cc
@@ -21,9 +21,6 @@ Window::Window(Window *parent) : Widget(static_cast<Widget *>(parent))
 
 Window::~Window()
 {
-	if (parent()) {
-		static_cast<Window *>(parent())->remove_window(this);
-	}
 	window_children.clear();
 }
 
@@ -34,8 +31,7 @@ void Window::draw_border()
 
 	if (palette())
 		render::gl::color(palette()->foreground());
-	math::Vector2f v(to_global(location()));
-	render::primitives::border(v, size());
+	render::primitives::border(global_location(), size());
 }
 
 Window::Windows::iterator Window::find_window(Window *window)
@@ -59,10 +55,11 @@ void Window::add_window(Window *window)
 	
 void Window::remove_window(Window *window)
 {
-
 	Windows::iterator it = find_window(window);
 	if (it != window_children.end()) {
+		remove_child(*it);
 		window_children.erase(it);
 	}
 }
+
 }