X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bf82503dcba2b12fc921040397a0387d6dea9dbb..31ae4773f86fa2732b81d60c8d8def4321d9fb9e:/lib/gui/ewidget.cpp diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp index b4c24d86..6d02ebaf 100644 --- a/lib/gui/ewidget.cpp +++ b/lib/gui/ewidget.cpp @@ -9,12 +9,9 @@ eWidget::eWidget(eWidget *parent): m_animation(this), m_parent(parent ? parent-> 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,20 +20,24 @@ 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; + /* ?? what about native move support? */ + invalidate(); + m_position = pos; - event(evtChangedPosition); - recalcClipRegionsWhenVisible(); - + if (m_notify_child_on_position_change) + for (ePtrList::iterator i(m_childs.begin()); i != m_childs.end(); ++i) + i->event(evtParentChangedPosition); + recalcClipRegionsWhenVisible(); /* try native move if supported. */ if ((m_vis & wVisShow) && ((!m_desktop) || m_desktop->movedWidget(this))) invalidate(); @@ -56,13 +57,15 @@ void eWidget::resize(eSize size) event(evtWillChangeSize, &size, &m_client_offset); if (old_size == m_size) return; - move(position() - old_offset); - invalidate(); event(evtChangedSize); - recalcClipRegionsWhenVisible(); - invalidate(); + + if (m_notify_child_on_position_change) + for (ePtrList::iterator i(m_childs.begin()); i != m_childs.end(); ++i) + i->event(evtParentChangedPosition); /* position/size is the same here */ + + recalcClipRegionsWhenVisible(); invalidate(); } void eWidget::invalidate(const gRegion ®ion) @@ -77,7 +80,6 @@ void eWidget::invalidate(const gRegion ®ion) if (res.empty()) return; - eWidget *root = this; ePoint abspos = position(); while (root && !root->m_desktop) @@ -86,7 +88,6 @@ void eWidget::invalidate(const gRegion ®ion) assert(root); abspos += root->position(); } - res.moveBy(abspos); // eDebug("region to invalidate:"); // dumpRegion(res); @@ -97,16 +98,23 @@ void eWidget::show() { if (m_vis & wVisShow) return; - - m_vis |= wVisShow; + m_vis |= wVisShow; /* TODO: optimize here to only recalc what's required. possibly merge with hide. */ eWidget *root = this; ePoint abspos = position(); while (root && !root->m_desktop) { root = root->m_parent; - assert(root); + if (!root) + { + /* 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); */ + return; + } abspos += root->position(); } @@ -125,7 +133,6 @@ 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)) @@ -137,6 +144,8 @@ void eWidget::hide() while (root && !root->m_desktop) { root = root->m_parent; + if (!root) + return; abspos += root->position(); } assert(root->m_desktop); @@ -171,18 +180,35 @@ 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::setTransparent(int transp) { - if (transp) - m_vis |= wVisTransparent; - else - m_vis &=~wVisTransparent; + if (isTransparent() != transp) + { + if (transp) + m_vis |= wVisTransparent; + else + m_vis &=~wVisTransparent; + recalcClipRegionsWhenVisible(); + } +} + +ePoint eWidget::getAbsolutePosition() +{ + eWidget *root = this; + ePoint abspos = position(); + + while (root && !root->m_desktop) + { + root = root->m_parent; + assert(root); + abspos += root->position(); + } + + return abspos; } void eWidget::mayKillFocus() @@ -196,18 +222,16 @@ void eWidget::mayKillFocus() eWidget::~eWidget() { hide(); - if (m_parent) m_parent->m_childs.remove(this); m_parent = 0; - /* destroy all childs */ + /* tell all childs that the parent is not anymore existing */ ePtrList::iterator i(m_childs.begin()); while (i != m_childs.end()) { - (*i)->m_parent = 0; - delete *i; + (*i)->parentRemoved(); i = m_childs.erase(i); } } @@ -215,7 +239,6 @@ eWidget::~eWidget() void eWidget::insertIntoParent() { ePtrList::iterator i = m_parent->m_childs.begin(); - for(;;) { if ((i == m_parent->m_childs.end()) || (i->m_z_position > m_z_position)) @@ -231,16 +254,12 @@ void eWidget::doPaint(gPainter &painter, const gRegion &r) { 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()) { painter.resetClip(region); @@ -251,7 +270,6 @@ void eWidget::doPaint(gPainter &painter, const gRegion &r) /* walk all childs */ for (ePtrList::iterator i(m_childs.begin()); i != m_childs.end(); ++i) i->doPaint(painter, childs); - painter.moveOffset(-position()); } @@ -272,6 +290,11 @@ void eWidget::recalcClipRegionsWhenVisible() } while(1); } +void eWidget::parentRemoved() +{ + m_parent = 0; +} + int eWidget::event(int event, void *data, void *data2) { switch (event) @@ -279,8 +302,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()) { @@ -294,6 +316,14 @@ int eWidget::event(int event, void *data, void *data2) painter.setBackgroundColor(m_background_color); painter.clear(); } + } else + { + eWidget *w = this; + while (w && !w->m_have_background_color) + w = w->m_parent; + + if (w) + painter.setBackgroundColor(w->m_background_color); } break; } @@ -303,10 +333,12 @@ int eWidget::event(int event, void *data, void *data2) m_size = *static_cast(data); break; case evtChangedSize: - { m_clip_region = gRegion(eRect(ePoint(0, 0), m_size)); break; - } + case evtParentChangedPosition: + for (ePtrList::iterator i(m_childs.begin()); i != m_childs.end(); ++i) + i->event(evtParentChangedPosition); + break; case evtFocusGot: m_focus_owner = (eWidget*)data; break; @@ -323,7 +355,6 @@ void eWidget::setFocus(eWidget *focus) { if (m_current_focus) m_current_focus->event(evtFocusLost, this); - m_current_focus = focus; if (m_current_focus)