a bit more/nicer fakes

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

diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp
index 7586c6277b7dd18e386845e3b80a800221b63922..8cb7d4ae0f4fdd15dbd000df2655207cf83b9ee7 100644 (file)
--- a/lib/gui/ewidget.cpp
+++ b/lib/gui/ewidget.cpp
@@ -3,15 +3,17 @@
 
 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_client_offset = eSize(0, 0);
+       
        if (m_parent)
                m_vis = wVisShow;
-               
+       
        if (m_parent)
        {
                m_parent->m_childs.push_back(this);
@@ -24,20 +26,19 @@ eWidget::eWidget(eWidget *parent): m_parent(parent ? parent->child() : 0)
 
 void eWidget::move(ePoint pos)
 {
+       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)
@@ -49,11 +50,13 @@ void eWidget::resize(eSize size)
                   fits into the other completely, and invalidate
                   only once. */
        eSize old_size = m_size;
-       eSize offset = eSize(0, 0);
-       event(evtWillChangeSize, &size, &offset);
+       eSize old_offset = m_client_offset;
+       m_client_offset = eSize(0, 0);
+       event(evtWillChangeSize, &size, &m_client_offset);
        if (old_size == m_size)
                return;
-       move(position() + offset);
+       
+       move(position() - old_offset);
        
        invalidate();
        event(evtChangedSize);
@@ -106,7 +109,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);
@@ -140,7 +143,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);
 }
 
@@ -224,7 +227,7 @@ void eWidget::recalcClipRegionsWhenVisible()
                        break;
                if (t->m_desktop)
                {
-                       t->m_desktop->recalcClipRegions();
+                       t->m_desktop->recalcClipRegions(t);
                        break;
                }
                t = t->m_parent;
@@ -278,7 +281,6 @@ int eWidget::event(int event, void *data, void *data2)
 
 void eWidget::setFocus(eWidget *focus)
 {
-       eDebug("setFocus in %p to %p, was %p", this, focus, m_current_focus);
        if (m_current_focus)
                m_current_focus->event(evtFocusLost, this);