fix

[enigma2.git] / lib / gui / ewindowstyle.cpp

diff --git a/lib/gui/ewindowstyle.cpp b/lib/gui/ewindowstyle.cpp
index 64adfb581d88149e3e840278caa53e64cedfddc2..79024a35d1ee80d7d573baf5906ee26b86682fcb 100644 (file)
--- a/lib/gui/ewindowstyle.cpp
+++ b/lib/gui/ewindowstyle.cpp
@@ -2,29 +2,54 @@
 #include <lib/gdi/esize.h>
 #include <lib/gui/ewindow.h>
 #include <lib/gui/ewindowstyle.h>
 #include <lib/gdi/esize.h>
 #include <lib/gui/ewindow.h>
 #include <lib/gui/ewindowstyle.h>

-
+#include <lib/base/init.h>
+#include <lib/base/init_num.h>

 
 eWindowStyle::~eWindowStyle() {}
 
 
 eWindowStyle::~eWindowStyle() {}
 

+DEFINE_REF(eWindowStyleManager);
+
+eWindowStyleManager::eWindowStyleManager()
+{
+       m_instance = this;
+}
+
+eWindowStyleManager::~eWindowStyleManager()
+{
+       m_instance = 0;
+}
+
+void eWindowStyleManager::getStyle(ePtr<eWindowStyle> &style)
+{
+       style = m_current_style;
+}
+
+void eWindowStyleManager::setStyle(eWindowStyle *style)
+{
+       m_current_style = style;
+}
+
+eWindowStyleManager *eWindowStyleManager::m_instance;
+

 DEFINE_REF(eWindowStyleSimple);
 
 eWindowStyleSimple::eWindowStyleSimple()
 {
 DEFINE_REF(eWindowStyleSimple);
 
 eWindowStyleSimple::eWindowStyleSimple()
 {

-       m_border_left = m_border_right = m_border_bottom = 1;
+       m_border_left = m_border_right = m_border_bottom = 2;

        m_border_top = 30;
 
        m_fnt = new gFont("Arial", 25);
        
        m_border_top = 30;
 
        m_fnt = new gFont("Arial", 25);
        

-       m_border_color_tl = gColor(0x14);
-       m_border_color_br = gColor(0x1c);
+       m_border_color_tl = gColor(0x1f);
+       m_border_color_br = gColor(0x14);

        m_title_color_back = gColor(0x20);
        m_title_color = gColor(0x2f);
        m_title_color_back = gColor(0x20);
        m_title_color = gColor(0x2f);

-       m_background_color = gColor(0x18);
+       m_background_color = gColor(0x19);

 }
 
 }
 

-void eWindowStyleSimple::handleNewSize(eWindow *wnd, const eSize &size)
+void eWindowStyleSimple::handleNewSize(eWindow *wnd, eSize &size, eSize &offset)

 {
 {

-       eDebug("handle new size: %d x %d", size.width(), size.height());
+//     eDebug("handle new size: %d x %d", size.width(), size.height());

        
        eWidget *child = wnd->child();
        
        
        eWidget *child = wnd->child();
        


@@ -36,19 +61,27 @@ void eWindowStyleSimple::handleNewSize(eWindow *wnd, const eSize &size)
 
 void eWindowStyleSimple::paintWindowDecoration(eWindow *wnd, gPainter &painter, const std::string &title)
 {
 
 void eWindowStyleSimple::paintWindowDecoration(eWindow *wnd, gPainter &painter, const std::string &title)
 {

+       painter.setForegroundColor(m_title_color_back);
+       painter.fill(eRect(2, 2, wnd->size().width() - 4, m_border_top - 4));

        painter.setBackgroundColor(m_title_color_back);
        painter.setForegroundColor(m_title_color);
        painter.setBackgroundColor(m_title_color_back);
        painter.setForegroundColor(m_title_color);

-       painter.clear();

        painter.setFont(m_fnt);
        painter.setFont(m_fnt);

-       painter.renderText(eRect(1, 1, wnd->size().width() - 2, m_border_top - 2), title);
+       painter.renderText(eRect(3, 3, wnd->size().width() - 6, m_border_top - 6), title);

 
        eRect frame(ePoint(0, 0), wnd->size());
 
        eRect frame(ePoint(0, 0), wnd->size());

-       painter.setForegroundColor(m_border_color_tl);
+
+       painter.setForegroundColor(m_background_color);

        painter.line(frame.topLeft1(), frame.topRight1());
        painter.line(frame.topLeft1(), frame.topRight1());

-       painter.line(frame.topRight1(), frame.bottomRight1());
+       painter.line(frame.topLeft1(), frame.bottomLeft1());
+       painter.setForegroundColor(m_border_color_tl);
+       painter.line(frame.topLeft1()+eSize(1,1), frame.topRight1()+eSize(0,1));
+       painter.line(frame.topLeft1()+eSize(1,1), frame.bottomLeft1()+eSize(1,0));
+

        painter.setForegroundColor(m_border_color_br);
        painter.setForegroundColor(m_border_color_br);

-       painter.line(frame.bottomRight1(), frame.bottomLeft1());
-       painter.line(frame.bottomLeft1(), frame.topLeft1());
+       painter.line(frame.bottomLeft()+eSize(1,-1), frame.bottomRight()+eSize(0,-1));
+       painter.line(frame.topRight1()+eSize(-1,1), frame.bottomRight1()+eSize(-1, 0));
+       painter.line(frame.bottomLeft()+eSize(1,-2), frame.bottomRight()+eSize(0,-2));
+       painter.line(frame.topRight1()+eSize(-0,1), frame.bottomRight1()+eSize(-0, 0));

 }
 
 void eWindowStyleSimple::paintBackground(gPainter &painter, const ePoint &offset, const eSize &size)
 }
 
 void eWindowStyleSimple::paintBackground(gPainter &painter, const ePoint &offset, const eSize &size)


@@ -72,6 +105,10 @@ void eWindowStyleSimple::setStyle(gPainter &painter, int what)
                painter.setForegroundColor(gColor(0x1C));
                painter.setBackgroundColor(m_background_color);
                break;
                painter.setForegroundColor(gColor(0x1C));
                painter.setBackgroundColor(m_background_color);
                break;

+       case styleListboxMarked:
+               painter.setForegroundColor(gColor(0x2F));
+               painter.setBackgroundColor(gColor(0x2A));
+               break;

        }
 }
 
        }
 }
 


@@ -97,3 +134,25 @@ void eWindowStyleSimple::drawFrame(gPainter &painter, const eRect &frame, int wh
        painter.line(frame.bottomRight1(), frame.bottomLeft1());
        painter.line(frame.bottomLeft1(), frame.topLeft1());
 }
        painter.line(frame.bottomRight1(), frame.bottomLeft1());
        painter.line(frame.bottomLeft1(), frame.topLeft1());
 }

+
+RESULT eWindowStyleSimple::getFont(int what, ePtr<gFont> &fnt)
+{
+       fnt = 0;
+       switch (what)
+       {
+       case fontStatic:
+               fnt = new gFont("Arial", 12);
+               break;
+       case fontButton:
+               fnt = new gFont("Arial", 20);
+               break;
+       case fontTitlebar:
+               fnt = new gFont("Arial", 25);
+               break;
+       default:
+               return -1;
+       }
+       return 0;
+}
+
+eAutoInitPtr<eWindowStyleManager> init_eWindowStyleManager(eAutoInitNumbers::skin, "eWindowStyleManager");