add CI

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

diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp
index 3ba248ff5eda6f81cdcf7d80513c6a7db28d7ad0..474e295d0d86830c99413e2d41c784c19032b5fa 100644 (file)
--- a/lib/gui/ewidget.cpp
+++ b/lib/gui/ewidget.cpp
@@ -9,6 +9,8 @@ eWidget::eWidget(eWidget *parent): m_parent(parent ? parent->child() : 0)
        m_desktop = 0;
        m_have_background_color = 0;
        
+       m_client_offset = eSize(0, 0);
+       
        if (m_parent)
                m_vis = wVisShow;
                
@@ -17,15 +19,18 @@ eWidget::eWidget(eWidget *parent): m_parent(parent ? parent->child() : 0)
                m_parent->m_childs.push_back(this);
                m_parent->getStyle(m_style);
        }
+
+       m_current_focus = 0;
+       m_focus_owner = 0;
 }
 
 void eWidget::move(ePoint pos)
 {
+       m_position = 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
@@ -46,11 +51,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);
@@ -150,11 +157,23 @@ void eWidget::destruct()
 
 void eWidget::setBackgroundColor(const gRGB &col)
 {
-       eDebug("set background color in ewidget!");
        m_background_color = col;
        m_have_background_color = 1;
 }
 
+void eWidget::clearBackgroundColor()
+{
+       m_have_background_color = 0;
+}
+
+void eWidget::mayKillFocus()
+{
+       setFocus(0);
+               /* when we have the focus, remove it first. */
+       if (m_focus_owner)
+               m_focus_owner->setFocus(0);
+}
+
 eWidget::~eWidget()
 {
        hide();
@@ -249,9 +268,26 @@ int eWidget::event(int event, void *data, void *data2)
                m_clip_region = gRegion(eRect(ePoint(0, 0),  m_size));
                break;
        }
+       case evtFocusGot:
+               m_focus_owner = (eWidget*)data;
+               break;
+       case evtFocusLost:
+               m_focus_owner = 0;
+               break;
        default:
                return -1;
        }
        return 0;
 }
 
+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);
+}
+