- listbox size gets recalculated at the correct position

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

diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp
index 3ebac357360bab13b303e9d8fc8c4bb2fca54175..3ba248ff5eda6f81cdcf7d80513c6a7db28d7ad0 100644 (file)
--- a/lib/gui/ewidget.cpp
+++ b/lib/gui/ewidget.cpp
@@ -7,10 +7,11 @@ eWidget::eWidget(eWidget *parent): m_parent(parent ? parent->child() : 0)
 {
        m_vis = 0;
        m_desktop = 0;
+       m_have_background_color = 0;
        
        if (m_parent)
                m_vis = wVisShow;
-       
+               
        if (m_parent)
        {
                m_parent->m_childs.push_back(this);
@@ -45,10 +46,12 @@ void eWidget::resize(eSize size)
                   fits into the other completely, and invalidate
                   only once. */
        eSize old_size = m_size;
-       event(evtWillChangeSize, &size);
+       eSize offset = eSize(0, 0);
+       event(evtWillChangeSize, &size, &offset);
        if (old_size == m_size)
                return;
-
+       move(position() + offset);
+       
        invalidate();
        event(evtChangedSize);
        recalcClipRegionsWhenVisible(); 
@@ -109,7 +112,17 @@ void eWidget::show()
 
 void eWidget::hide()
 {
+               /* TODO: when hiding an upper level widget, widgets get hidden but keep the */
+               /* wVisShow flag (because when the widget is shown again, the widgets must */
+               /* become visible again. */
+       if (!(m_vis & wVisShow))
+               return;
        m_vis &= ~wVisShow;
+       
+               /* this is a workaround to the above problem. when we are in the delete phase, 
+                  don't hide childs. */
+       if (!(m_parent || m_desktop))
+               return;
 
                /* TODO: optimize here to only recalc what's required. possibly merge with show. */
        eWidget *root = this;
@@ -135,11 +148,22 @@ void eWidget::destruct()
        delete this;
 }
 
+void eWidget::setBackgroundColor(const gRGB &col)
+{
+       eDebug("set background color in ewidget!");
+       m_background_color = col;
+       m_have_background_color = 1;
+}
+
 eWidget::~eWidget()
 {
+       hide();
+       
        if (m_parent)
                m_parent->m_childs.remove(this);
 
+       m_parent = 0;
+
                /* destroy all childs */
        ePtrList<eWidget>::iterator i(m_childs.begin());
        while (i != m_childs.end())
@@ -203,9 +227,16 @@ int eWidget::event(int event, void *data, void *data2)
                
 //             eDebug("eWidget::evtPaint");
 //             dumpRegion(*(gRegion*)data);
-               ePtr<eWindowStyle> style;
-               if (!getStyle(style))
-                       style->paintBackground(painter, ePoint(0, 0), size());
+               if (!m_have_background_color)
+               {
+                       ePtr<eWindowStyle> style;
+                       if (!getStyle(style))
+                               style->paintBackground(painter, ePoint(0, 0), size());
+               } else
+               {
+                       painter.setBackgroundColor(m_background_color);
+                       painter.clear();
+               }
                break;
        }
        case evtKey: