X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4c9d04cb33fb06dfa075b431e36e7ea938a5f963..31ae4773f86fa2732b81d60c8d8def4321d9fb9e:/lib/gui/ewidget.cpp diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp index 7f089361..6d02ebaf 100644 --- a/lib/gui/ewidget.cpp +++ b/lib/gui/ewidget.cpp @@ -3,37 +3,44 @@ extern void dumpRegion(const gRegion ®ion); -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); } + + 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; - - 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. */ + + /* ?? what about native move support? */ invalidate(); + + m_position = pos; event(evtChangedPosition); - recalcClipRegionsWhenVisible(); - invalidate(); + 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(); } void eWidget::resize(eSize size) @@ -45,14 +52,20 @@ void eWidget::resize(eSize size) fits into the other completely, and invalidate only once. */ eSize old_size = m_size; - event(evtWillChangeSize, &size); + 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() - 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) @@ -67,7 +80,6 @@ void eWidget::invalidate(const gRegion ®ion) if (res.empty()) return; - eWidget *root = this; ePoint abspos = position(); while (root && !root->m_desktop) @@ -76,7 +88,6 @@ void eWidget::invalidate(const gRegion ®ion) assert(root); abspos += root->position(); } - res.moveBy(abspos); // eDebug("region to invalidate:"); // dumpRegion(res); @@ -87,20 +98,27 @@ 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(); } - root->m_desktop->recalcClipRegions(); + root->m_desktop->recalcClipRegions(root); gRegion abs = m_visible_with_childs; abs.moveBy(abspos); @@ -115,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)) @@ -127,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); @@ -134,7 +153,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); } @@ -145,48 +164,112 @@ void eWidget::destruct() delete this; } +void eWidget::setBackgroundColor(const gRGB &col) +{ + 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::setTransparent(int transp) +{ + 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() +{ + setFocus(0); + /* when we have the focus, remove it first. */ + if (m_focus_owner) + m_focus_owner->setFocus(0); +} + 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); } } +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)) + { + m_parent->m_childs.insert(i, this); + return; + } + ++i; + } +} + void eWidget::doPaint(gPainter &painter, const gRegion &r) { if (m_visible_with_childs.empty()) return; - - gRegion region = r; + gRegion region = r, childs = r; /* we were in parent's space, now we are in local space */ region.moveBy(-position()); - painter.moveOffset(position()); - /* walk all childs */ - for (ePtrList::iterator i(m_childs.begin()); i != m_childs.end(); ++i) - i->doPaint(painter, region); - /* check if there's anything for us to paint */ region &= m_visible_region; - if (!region.empty()) { painter.resetClip(region); event(evtPaint, ®ion, &painter); } - + + childs.moveBy(-position()); + /* walk all childs */ + for (ePtrList::iterator i(m_childs.begin()); i != m_childs.end(); ++i) + i->doPaint(painter, childs); painter.moveOffset(-position()); } @@ -199,7 +282,7 @@ void eWidget::recalcClipRegionsWhenVisible() break; if (t->m_desktop) { - t->m_desktop->recalcClipRegions(); + t->m_desktop->recalcClipRegions(t); break; } t = t->m_parent; @@ -207,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) @@ -214,12 +302,29 @@ int eWidget::event(int event, void *data, void *data2) case evtPaint: { gPainter &painter = *(gPainter*)data2; - -// eDebug("eWidget::evtPaint"); + // eDebug("eWidget::evtPaint"); // dumpRegion(*(gRegion*)data); - ePtr style; - if (!getStyle(style)) - style->paintBackground(painter, ePoint(0, 0), size()); + if (!isTransparent()) + { + if (!m_have_background_color) + { + ePtr style; + if (!getStyle(style)) + style->paintBackground(painter, ePoint(0, 0), size()); + } else + { + 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; } case evtKey: @@ -228,13 +333,31 @@ 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; + 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); +} +