fix

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

diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp
index 474e295d0d86830c99413e2d41c784c19032b5fa..b047f5fb030efe84d5baede01e6e1f39fcc0db30 100644 (file)
--- a/lib/gui/ewidget.cpp
+++ b/lib/gui/ewidget.cpp
@@ -3,20 +3,21 @@
 
 extern void dumpRegion(const gRegion &region);
 
-eWidget::eWidget(eWidget *parent): m_parent(parent ? parent->child() : 0)
+eWidget::eWidget(eWidget *parent): m_animation(this), m_parent(parent ? parent->child() : 0)
 {
        m_vis = 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)
        {
-               m_parent->m_childs.push_back(this);
+               insertIntoParent();
                m_parent->getStyle(m_style);
        }
 
@@ -26,20 +27,19 @@ eWidget::eWidget(eWidget *parent): m_parent(parent ? parent->child() : 0)
 
 void eWidget::move(ePoint pos)
 {
-       m_position = pos + m_client_offset;
+       pos = pos + m_client_offset;
        
        if (m_position == pos)
                return;
+
+       m_position = pos;
        
-               /* we invalidate before and after the move to
-                  cause a correct redraw. The area which is
-                  included both before and after isn't redrawn
-                  twice because a invalidate doesn't immediately
-                  redraws the region. */
-       invalidate();
        event(evtChangedPosition);
-       recalcClipRegionsWhenVisible(); 
-       invalidate();
+       recalcClipRegionsWhenVisible();
+       
+               /* try native move if supported. */
+       if ((m_vis & wVisShow) && ((!m_desktop) || m_desktop->movedWidget(this)))
+               invalidate();
 }
 
 void eWidget::resize(eSize size)
@@ -110,7 +110,7 @@ void eWidget::show()
                abspos += root->position();
        }
 
-       root->m_desktop->recalcClipRegions();
+       root->m_desktop->recalcClipRegions(root);
 
        gRegion abs = m_visible_with_childs;
        abs.moveBy(abspos);
@@ -144,7 +144,7 @@ void eWidget::hide()
        gRegion abs = m_visible_with_childs;
        abs.moveBy(abspos);
 
-       root->m_desktop->recalcClipRegions();
+       root->m_desktop->recalcClipRegions(root);
        root->m_desktop->invalidate(abs);
 }
 
@@ -166,6 +166,17 @@ void eWidget::clearBackgroundColor()
        m_have_background_color = 0;
 }
 
+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 */
+}
+
 void eWidget::mayKillFocus()
 {
        setFocus(0);
@@ -193,6 +204,21 @@ 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))
+               {
+                       m_parent->m_childs.insert(i, this);
+                       return;
+               }
+               ++i;
+       }
+}
+
 void eWidget::doPaint(gPainter &painter, const gRegion &r)
 {
        if (m_visible_with_childs.empty())
@@ -228,7 +254,7 @@ void eWidget::recalcClipRegionsWhenVisible()
                        break;
                if (t->m_desktop)
                {
-                       t->m_desktop->recalcClipRegions();
+                       t->m_desktop->recalcClipRegions(t);
                        break;
                }
                t = t->m_parent;