1 files changed, 19 insertions, 67 deletions

diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index e57918b7..14d91af1 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -23,7 +23,6 @@
 
 #include "configuration.h"
 #include "log.h"
-#include "textrenderer.h"
 
 #include "gui/gui.h"
 #include "gui/viewport.h"
@@ -53,7 +52,7 @@ Window::Window(SkinType skinType, const std::string &caption, bool modal, Window
     , mMaxWinWidth(graphics->getWidth())
     , mMaxWinHeight(graphics->getHeight())
 {
-    logger->log("Window::Window(\"%s\")", caption.c_str());
+    Log::debug("Window::Window(\"%s\")", caption.c_str());
 
     if (!windowContainer)
         throw GCN_EXCEPTION("Window::Window(): no windowContainer set");
@@ -82,7 +81,7 @@ Window::Window(SkinType skinType, const std::string &caption, bool modal, Window
 
 Window::~Window()
 {
-    logger->log("Window::~Window(\"%s\")", getCaption().c_str());
+    Log::debug("Window::~Window(\"%s\")", getCaption().c_str());
 
     saveWindowState();
 
@@ -139,13 +138,12 @@ void Window::drawFrame(gcn::Graphics *graphics)
         if (auto skinState = skin.getState(widgetState.flags))
         {
             auto &textFormat = skinState->textFormat;
-            TextRenderer::renderText(g,
-                                     getCaption(),
-                                     getFrameSize() + skin.titleOffsetX,
-                                     getFrameSize() + skin.titleOffsetY,
-                                     gcn::Graphics::LEFT,
-                                     textFormat.bold ? boldFont : getFont(),
-                                     textFormat);
+            g->drawText(getCaption(),
+                        getFrameSize() + skin.titleOffsetX,
+                        getFrameSize() + skin.titleOffsetY,
+                        gcn::Graphics::LEFT,
+                        textFormat.bold ? boldFont : getFont(),
+                        textFormat);
         }
     }
 }
@@ -191,52 +189,6 @@ void Window::setLocationRelativeTo(gcn::Widget *widget)
                 getY() + (wy + (widget->getHeight() - getHeight()) / 2 - y));
 }
 
-void Window::setLocationRelativeTo(ImageRect::ImagePosition position,
-                                   int offsetX, int offsetY)
-{
-    if (position == ImageRect::UPPER_LEFT)
-    {
-    }
-    else if (position == ImageRect::UPPER_CENTER)
-    {
-        offsetX += (graphics->getWidth() - getWidth()) / 2;
-    }
-    else if (position == ImageRect::UPPER_RIGHT)
-    {
-        offsetX += graphics->getWidth() - getWidth();
-    }
-    else if (position == ImageRect::LEFT)
-    {
-        offsetY += (graphics->getHeight() - getHeight()) / 2;
-    }
-    else if (position == ImageRect::CENTER)
-    {
-        offsetX += (graphics->getWidth() - getWidth()) / 2;
-        offsetY += (graphics->getHeight() - getHeight()) / 2;
-    }
-    else if (position == ImageRect::RIGHT)
-    {
-        offsetX += graphics->getWidth() - getWidth();
-        offsetY += (graphics->getHeight() - getHeight()) / 2;
-    }
-    else if (position == ImageRect::LOWER_LEFT)
-    {
-        offsetY += graphics->getHeight() - getHeight();
-    }
-    else if (position == ImageRect::LOWER_CENTER)
-    {
-        offsetX += (graphics->getWidth() - getWidth()) / 2;
-        offsetY += graphics->getHeight() - getHeight();
-    }
-    else if (position == ImageRect::LOWER_RIGHT)
-    {
-        offsetX += graphics->getWidth() - getWidth();
-        offsetY += graphics->getHeight() - getHeight();
-    }
-
-    setPosition(offsetX, offsetY);
-}
-
 void Window::setMinWidth(int width)
 {
     mMinWinWidth = std::max(getSkin().getMinWidth(), width);
@@ -599,41 +551,41 @@ void Window::setDefaultSize()
 }
 
 void Window::setDefaultSize(int defaultWidth, int defaultHeight,
-                            ImageRect::ImagePosition position,
+                            WindowAlignment alignment,
                             int offsetX, int offsetY)
 {
     int x = 0;
     int y = 0;
 
-    switch (position)
+    switch (alignment)
     {
-    case ImageRect::UPPER_LEFT:
+    case WindowAlignment::TopLeft:
         break;
-    case ImageRect::UPPER_CENTER:
+    case WindowAlignment::Top:
         x = (graphics->getWidth() - defaultWidth) / 2;
         break;
-    case ImageRect::UPPER_RIGHT:
+    case WindowAlignment::TopRight:
         x = graphics->getWidth() - defaultWidth;
         break;
-    case ImageRect::LEFT:
+    case WindowAlignment::Left:
         y = (graphics->getHeight() - defaultHeight) / 2;
         break;
-    case ImageRect::CENTER:
+    case WindowAlignment::Center:
         x = (graphics->getWidth() - defaultWidth) / 2;
         y = (graphics->getHeight() - defaultHeight) / 2;
         break;
-    case ImageRect::RIGHT:
+    case WindowAlignment::Right:
         x = graphics->getWidth() - defaultWidth;
         y = (graphics->getHeight() - defaultHeight) / 2;
         break;
-    case ImageRect::LOWER_LEFT:
+    case WindowAlignment::BottomLeft:
         y = graphics->getHeight() - defaultHeight;
         break;
-    case ImageRect::LOWER_CENTER:
+    case WindowAlignment::Bottom:
         x = (graphics->getWidth() - defaultWidth) / 2;
         y = graphics->getHeight() - defaultHeight;
         break;
-    case ImageRect::LOWER_RIGHT:
+    case WindowAlignment::BottomRight:
         x = graphics->getWidth() - defaultWidth;
         y = graphics->getHeight() - defaultHeight;
         break;