X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ba02fb4aced5868d047a5bffbd2ed87583daee4d..1681d7dadff09e071c4f79954a90969fb7815210:/lib/gui/ewidget.cpp diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp index 3ebac357..3bc6e663 100644 --- a/lib/gui/ewidget.cpp +++ b/lib/gui/ewidget.cpp @@ -3,37 +3,46 @@ 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; } void eWidget::move(ePoint pos) { + pos = pos + m_client_offset; + if (m_position == pos) return; - + + /* ?? what about native move support? */ + invalidate(); + 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) @@ -45,10 +54,14 @@ 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(); @@ -100,7 +113,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); @@ -109,7 +122,17 @@ void eWidget::show() void eWidget::hide() { + /* TODO: when hiding an upper level widget, widgets get hidden but keep the */ + /* wVisShow flag (because when the widget is shown again, the widgets must */ + /* become visible again. */ + 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)) + return; /* TODO: optimize here to only recalc what's required. possibly merge with show. */ eWidget *root = this; @@ -117,6 +140,8 @@ void eWidget::hide() while (root && !root->m_desktop) { root = root->m_parent; + if (!root) + return; abspos += root->position(); } assert(root->m_desktop); @@ -124,7 +149,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); } @@ -135,34 +160,87 @@ 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 (transp) + m_vis |= wVisTransparent; + else + m_vis &=~wVisTransparent; +} + +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); - /* destroy all childs */ + m_parent = 0; + + /* 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; @@ -172,6 +250,11 @@ void eWidget::doPaint(gPainter &painter, const gRegion &r) 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()); } @@ -185,7 +268,7 @@ void eWidget::recalcClipRegionsWhenVisible() break; if (t->m_desktop) { - t->m_desktop->recalcClipRegions(); + t->m_desktop->recalcClipRegions(t); break; } t = t->m_parent; @@ -193,6 +276,11 @@ void eWidget::recalcClipRegionsWhenVisible() } while(1); } +void eWidget::parentRemoved() +{ + m_parent = 0; +} + int eWidget::event(int event, void *data, void *data2) { switch (event) @@ -203,9 +291,23 @@ int eWidget::event(int event, void *data, void *data2) // 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 + { + if (m_have_background_color) + painter.setBackgroundColor(m_background_color); + } break; } case evtKey: @@ -218,9 +320,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); +} +