fix tabs

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

diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp
index 8a396ad36e09a1d533d25c2da817defc6e8280b0..19009fb9f969a299a600678a4b1c446173dc847e 100644 (file)
--- a/lib/gui/ewidget.cpp
+++ b/lib/gui/ewidget.cpp
@@ -6,15 +6,13 @@ extern void dumpRegion(const gRegion &region);
 eWidget::eWidget(eWidget *parent): m_animation(this), m_parent(parent ? parent->child() : 0)
 {
        m_vis = 0;
+       m_layer = 0;
        m_desktop = 0;
        m_have_background_color = 0;
        m_z_position = 0;
-       
        m_client_offset = eSize(0, 0);
-       
        if (m_parent)
                m_vis = wVisShow;
-       
        if (m_parent)
        {
                insertIntoParent();
@@ -23,14 +21,12 @@ eWidget::eWidget(eWidget *parent): m_animation(this), m_parent(parent ? parent->
 
        m_current_focus = 0;
        m_focus_owner = 0;
-       
        m_notify_child_on_position_change = 1;
 }
 
 void eWidget::move(ePoint pos)
 {
        pos = pos + m_client_offset;
-       
        if (m_position == pos)
                return;
 
@@ -38,15 +34,11 @@ void eWidget::move(ePoint pos)
        invalidate();
 
        m_position = pos;
-       
        event(evtChangedPosition);
-       
        if (m_notify_child_on_position_change)
                for (ePtrList<eWidget>::iterator i(m_childs.begin()); i != m_childs.end(); ++i)
                        i->event(evtParentChangedPosition);
-               
-       recalcClipRegionsWhenVisible();
-       
+               recalcClipRegionsWhenVisible();
                /* try native move if supported. */
        if ((m_vis & wVisShow) && ((!m_desktop) || m_desktop->movedWidget(this)))
                invalidate();
@@ -62,13 +54,12 @@ void eWidget::resize(eSize size)
                   only once. */
        eSize old_size = m_size;
        eSize old_offset = m_client_offset;
+       m_client_size = size;
        m_client_offset = eSize(0, 0);
        event(evtWillChangeSize, &size, &m_client_offset);
        if (old_size == m_size)
                return;
-       
        move(position() - old_offset);
-       
        invalidate();
        event(evtChangedSize);
 
@@ -76,8 +67,7 @@ void eWidget::resize(eSize size)
                for (ePtrList<eWidget>::iterator i(m_childs.begin()); i != m_childs.end(); ++i)
                        i->event(evtParentChangedPosition); /* position/size is the same here */
 
-       recalcClipRegionsWhenVisible(); 
-       invalidate();
+       recalcClipRegionsWhenVisible(); invalidate();
 }
 
 void eWidget::invalidate(const gRegion &region)
@@ -92,20 +82,22 @@ void eWidget::invalidate(const gRegion &region)
 
        if (res.empty())
                return;
-       
        eWidget *root = this;
        ePoint abspos = position();
+       int target_layer = m_layer;
+
        while (root && !root->m_desktop)
        {
                root = root->m_parent;
-               assert(root);
+               ASSERT(root);
+               if (root->m_layer != -1)
+                       target_layer = root->m_layer;
                abspos += root->position();
        }
-       
        res.moveBy(abspos);
 //     eDebug("region to invalidate:");
 //     dumpRegion(res);
-       root->m_desktop->invalidate(res);
+       root->m_desktop->invalidate(res, this, target_layer);
 }
 
 void eWidget::show()
@@ -114,10 +106,14 @@ void eWidget::show()
                return;
 
        m_vis |= wVisShow;
-       
+//     eDebug("show widget %p", this);
+       notifyShowHide();
+
                /* TODO: optimize here to only recalc what's required. possibly merge with hide. */
        eWidget *root = this;
        ePoint abspos = position();
+       int target_layer = m_layer;
+
        while (root && !root->m_desktop)
        {
                root = root->m_parent;
@@ -126,11 +122,12 @@ void eWidget::show()
                                /* oops: our root widget does not have a desktop associated. 
                                        probably somebody already erased the root, but tries some
                                        operations on a child window. 
-                                       
-                                       ignore them for now. */
-                       /* assert(root); */
+                                                                       ignore them for now. */
+                       /* ASSERT(root); */
                        return;
                }
+               if (root->m_layer != -1)
+                       target_layer = root->m_layer;
                abspos += root->position();
        }
 
@@ -138,7 +135,7 @@ void eWidget::show()
 
        gRegion abs = m_visible_with_childs;
        abs.moveBy(abspos);
-       root->m_desktop->invalidate(abs);
+       root->m_desktop->invalidate(abs, this, target_layer);
 }
 
 void eWidget::hide()
@@ -149,11 +146,12 @@ void eWidget::hide()
        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;
+       notifyShowHide();
 
                /* TODO: optimize here to only recalc what's required. possibly merge with show. */
        eWidget *root = this;
@@ -165,7 +163,7 @@ void eWidget::hide()
                        return;
                abspos += root->position();
        }
-       assert(root->m_desktop);
+       ASSERT(root->m_desktop);
 
        gRegion abs = m_visible_with_childs;
        abs.moveBy(abspos);
@@ -197,9 +195,7 @@ void eWidget::setZPosition(int z)
        m_z_position = z;
        if (!m_parent)
                return;
-       
        m_parent->m_childs.remove(this);
-       
        insertIntoParent(); /* now at the new Z position */
 }
 
@@ -223,7 +219,7 @@ ePoint eWidget::getAbsolutePosition()
        while (root && !root->m_desktop)
        {
                root = root->m_parent;
-               assert(root);
+               ASSERT(root);
                abspos += root->position();
        }
 
@@ -241,7 +237,6 @@ void eWidget::mayKillFocus()
 eWidget::~eWidget()
 {
        hide();
-       
        if (m_parent)
                m_parent->m_childs.remove(this);
 
@@ -259,7 +254,6 @@ eWidget::~eWidget()
 void eWidget::insertIntoParent()
 {
        ePtrList<eWidget>::iterator i = m_parent->m_childs.begin();
-       
        for(;;)
        {
                if ((i == m_parent->m_childs.end()) || (i->m_z_position > m_z_position))
@@ -271,31 +265,29 @@ void eWidget::insertIntoParent()
        }
 }
 
-void eWidget::doPaint(gPainter &painter, const gRegion &r)
+void eWidget::doPaint(gPainter &painter, const gRegion &r, int layer)
 {
        if (m_visible_with_childs.empty())
                return;
-       
        gRegion region = r, childs = r;
                        /* we were in parent's space, now we are in local space */
        region.moveBy(-position());
-       
        painter.moveOffset(position());
-       
                /* check if there's anything for us to paint */
-       region &= m_visible_region;
-       
-       if (!region.empty())
+       if (layer == m_layer)
        {
-               painter.resetClip(region);
-               event(evtPaint, &region, &painter);
+               region &= m_visible_region;
+               if (!region.empty())
+               {
+                       painter.resetClip(region);
+                       event(evtPaint, &region, &painter);
+               }
        }
 
        childs.moveBy(-position());
                /* walk all childs */
        for (ePtrList<eWidget>::iterator i(m_childs.begin()); i != m_childs.end(); ++i)
-               i->doPaint(painter, childs);
-       
+               i->doPaint(painter, childs, layer);
        painter.moveOffset(-position());
 }
 
@@ -312,7 +304,7 @@ void eWidget::recalcClipRegionsWhenVisible()
                        break;
                }
                t = t->m_parent;
-               assert(t);
+               ASSERT(t);
        } while(1);
 }
 
@@ -328,8 +320,7 @@ int eWidget::event(int event, void *data, void *data2)
        case evtPaint:
        {
                gPainter &painter = *(gPainter*)data2;
-               
-//             eDebug("eWidget::evtPaint");
+       //              eDebug("eWidget::evtPaint");
 //             dumpRegion(*(gRegion*)data);
                if (!isTransparent())
                {
@@ -346,7 +337,6 @@ int eWidget::event(int event, void *data, void *data2)
                } else
                {
                        eWidget *w = this;
-                       
                        while (w && !w->m_have_background_color)
                                w = w->m_parent;
 
@@ -383,10 +373,15 @@ void eWidget::setFocus(eWidget *focus)
 {
        if (m_current_focus)
                m_current_focus->event(evtFocusLost, this);
-       
        m_current_focus = focus;
 
        if (m_current_focus)
                m_current_focus->event(evtFocusGot, this);
 }
 
+void eWidget::notifyShowHide()
+{
+       event(evtParentVisibilityChanged);
+       for (ePtrList<eWidget>::iterator i(m_childs.begin()); i != m_childs.end(); ++i)
+               i->notifyShowHide();
+}