fix linked tuners (i hope)

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

diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp
index 2241577ecc959a1c723479c07faa830ed136e3de..b047f5fb030efe84d5baede01e6e1f39fcc0db30 100644 (file)
--- a/lib/gui/ewidget.cpp
+++ b/lib/gui/ewidget.cpp
@@ -3,18 +3,21 @@
 
 extern void dumpRegion(const gRegion &region);
 
 
 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_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_vis = wVisShow;

-               
+       

        if (m_parent)
        {
        if (m_parent)
        {

-               m_parent->m_childs.push_back(this);
+               insertIntoParent();

                m_parent->getStyle(m_style);
        }
 
                m_parent->getStyle(m_style);
        }
 


@@ -24,20 +27,19 @@ eWidget::eWidget(eWidget *parent): m_parent(parent ? parent->child() : 0)
 
 void eWidget::move(ePoint pos)
 {
 
 void eWidget::move(ePoint pos)
 {

+       pos = pos + m_client_offset;
+       

        if (m_position == pos)
                return;
        if (m_position == pos)
                return;

-       
+

        m_position = pos;
        
        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);
        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)
 }
 
 void eWidget::resize(eSize size)


@@ -49,11 +51,13 @@ void eWidget::resize(eSize size)
                   fits into the other completely, and invalidate
                   only once. */
        eSize old_size = m_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;
        if (old_size == m_size)
                return;

-       move(position() + offset);
+       
+       move(position() - old_offset);

        
        invalidate();
        event(evtChangedSize);
        
        invalidate();
        event(evtChangedSize);


@@ -106,7 +110,7 @@ void eWidget::show()
                abspos += root->position();
        }
 
                abspos += root->position();
        }
 

-       root->m_desktop->recalcClipRegions();
+       root->m_desktop->recalcClipRegions(root);

 
        gRegion abs = m_visible_with_childs;
        abs.moveBy(abspos);
 
        gRegion abs = m_visible_with_childs;
        abs.moveBy(abspos);


@@ -140,7 +144,7 @@ void eWidget::hide()
        gRegion abs = m_visible_with_childs;
        abs.moveBy(abspos);
 
        gRegion abs = m_visible_with_childs;
        abs.moveBy(abspos);
 

-       root->m_desktop->recalcClipRegions();
+       root->m_desktop->recalcClipRegions(root);

        root->m_desktop->invalidate(abs);
 }
 
        root->m_desktop->invalidate(abs);
 }
 


@@ -153,11 +157,26 @@ void eWidget::destruct()
 
 void eWidget::setBackgroundColor(const gRGB &col)
 {
 
 void eWidget::setBackgroundColor(const gRGB &col)
 {

-       eDebug("set background color in ewidget!");

        m_background_color = col;
        m_have_background_color = 1;
 }
 
        m_background_color = col;
        m_have_background_color = 1;
 }
 

+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);
 void eWidget::mayKillFocus()
 {
        setFocus(0);


@@ -185,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())
 void eWidget::doPaint(gPainter &painter, const gRegion &r)
 {
        if (m_visible_with_childs.empty())


@@ -220,7 +254,7 @@ void eWidget::recalcClipRegionsWhenVisible()
                        break;
                if (t->m_desktop)
                {
                        break;
                if (t->m_desktop)
                {

-                       t->m_desktop->recalcClipRegions();
+                       t->m_desktop->recalcClipRegions(t);

                        break;
                }
                t = t->m_parent;
                        break;
                }
                t = t->m_parent;


@@ -264,7 +298,6 @@ int eWidget::event(int event, void *data, void *data2)
                m_focus_owner = (eWidget*)data;
                break;
        case evtFocusLost:
                m_focus_owner = (eWidget*)data;
                break;
        case evtFocusLost:

-               eDebug("unhandled focus lost in %p", this);

                m_focus_owner = 0;
                break;
        default:
                m_focus_owner = 0;
                break;
        default:


@@ -275,7 +308,6 @@ int eWidget::event(int event, void *data, void *data2)
 
 void eWidget::setFocus(eWidget *focus)
 {
 
 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);
        
        if (m_current_focus)
                m_current_focus->event(evtFocusLost, this);