remove debug

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

diff --git a/lib/gui/ewindowstyleskinned.cpp b/lib/gui/ewindowstyleskinned.cpp
index 20d508f6ed5e5a65fb5fd2ed0cc9891b2b21a3a4..6357dcbde7e6b7abd31ecb400efc99689aee63d4 100644 (file)
--- a/lib/gui/ewindowstyleskinned.cpp
+++ b/lib/gui/ewindowstyleskinned.cpp
@@ -70,6 +70,10 @@ void eWindowStyleSkinned::setStyle(gPainter &painter, int what)
                painter.setForegroundColor(m_color[colListboxMarkedForeground]);
                painter.setBackgroundColor(m_color[colListboxMarkedBackground]);
                break;
+       case styleListboxMarkedAndSelected:
+               painter.setForegroundColor(m_color[colListboxMarkedAndSelectedForeground]);
+               painter.setBackgroundColor(m_color[colListboxMarkedAndSelectedBackground]);
+               break;
        }
 }
 
@@ -196,13 +200,13 @@ RESULT eWindowStyleSkinned::getFont(int what, ePtr<gFont> &fnt)
        switch (what)
        {
        case fontStatic:
-               fnt = new gFont("Arial", 12);
+               fnt = new gFont("Regular", 12);
                break;
        case fontButton:
-               fnt = new gFont("Arial", 20);
+               fnt = new gFont("Regular", 20);
                break;
        case fontTitlebar:
-               fnt = new gFont("Arial", 25);
+               fnt = new gFont("Regular", 25);
                break;
        default:
                return -1;
@@ -210,6 +214,11 @@ RESULT eWindowStyleSkinned::getFont(int what, ePtr<gFont> &fnt)
        return 0;
 }
 
+void eWindowStyleSkinned::setPixmap(int bs, int bp, ePtr<gPixmap> &ptr)
+{
+       setPixmap(bs, bp, *(ptr.operator->()));
+}
+
 void eWindowStyleSkinned::setPixmap(int bs, int bp, gPixmap &pixmap)
 {
        if ((bs >= bsMax) || (bs < 0))
@@ -236,18 +245,21 @@ void eWindowStyleSkinned::setPixmap(int bs, int bp, gPixmap &pixmap)
                if (m_border[bs].m_pixmap[i])
                        if (m_border[bs].m_border_bottom < m_border[bs].m_pixmap[i]->size().height())
                                m_border[bs].m_border_bottom = m_border[bs].m_pixmap[i]->size().height();
-       for (int i = 0; i < 9; i += 3)
-               if (m_border[bs].m_pixmap[i])
-                       if (m_border[bs].m_border_left < m_border[bs].m_pixmap[i]->size().width())
-                               m_border[bs].m_border_left = m_border[bs].m_pixmap[i]->size().width();
-       for (int i = 2; i < 9; i += 3)
-               if (m_border[bs].m_pixmap[i])
-                       if (m_border[bs].m_border_right < m_border[bs].m_pixmap[i]->size().width())
-                               m_border[bs].m_border_right = m_border[bs].m_pixmap[i]->size().width();
-       eDebug("recalced border size for %d: %d:%d %d:%d",
+
+       if (m_border[bs].m_pixmap[3])
+               m_border[bs].m_border_left = m_border[bs].m_pixmap[3]->size().width();
+       else
+               m_border[bs].m_border_left = 0;
+       
+       if (m_border[bs].m_pixmap[5])
+               m_border[bs].m_border_right = m_border[bs].m_pixmap[5]->size().width();
+       else
+               m_border[bs].m_border_right = 0;
+
+/*     eDebug("recalced border size for %d: %d:%d %d:%d",
                bs, 
                m_border[bs].m_border_left, m_border[bs].m_border_top, 
-               m_border[bs].m_border_right, m_border[bs].m_border_bottom); 
+               m_border[bs].m_border_right, m_border[bs].m_border_bottom);  */
 }
 
 void eWindowStyleSkinned::setColor(int what, const gRGB &col)