X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ddc3964ed95d01e72229dc9af968a327cd84e56c..3220cd98443043566e3617c564370683d011878e:/lib/gui/ewidget.cpp diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp index 89fbfe95..b047f5fb 100644 --- a/lib/gui/ewidget.cpp +++ b/lib/gui/ewidget.cpp @@ -3,34 +3,78 @@ extern void dumpRegion(const gRegion ®ion); -eWidget::eWidget(eWidget *parent): m_parent(parent) +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; - if (parent) + m_client_offset = eSize(0, 0); + + if (m_parent) m_vis = wVisShow; - if (parent) - parent->m_childs.push_back(this); + if (m_parent) + { + 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; + m_position = pos; event(evtChangedPosition); + recalcClipRegionsWhenVisible(); + + /* try native move if supported. */ + if ((m_vis & wVisShow) && ((!m_desktop) || m_desktop->movedWidget(this))) + invalidate(); } void eWidget::resize(eSize size) { - event(evtWillChangeSize, &size); + /* same strategy as with move: we first check if + the size changed at all, and if it did, we + invalidate both the old and new area. + TODO: check if either the old or new area + fits into the other completely, and invalidate + only once. */ + eSize old_size = m_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(); } void eWidget::invalidate(const gRegion ®ion) { - gRegion res = /* region & */ m_visible_with_childs; + /* we determine the area to redraw, and re-position this + area to the absolute position, and then call the + desktop's invalidate() with that, which adds this + area into the dirty region. */ + gRegion res = m_visible_with_childs; + if (region.valid()) + res &= region; + if (res.empty()) return; @@ -66,7 +110,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); @@ -75,7 +119,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; @@ -90,7 +144,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); } @@ -101,17 +155,70 @@ 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::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 */ ePtrList::iterator i(m_childs.begin()); while (i != m_childs.end()) { + (*i)->m_parent = 0; delete *i; 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()) @@ -129,24 +236,52 @@ void eWidget::doPaint(gPainter &painter, const gRegion &r) /* check if there's anything for us to paint */ region &= m_visible_region; - painter.resetClip(region); - event(evtPaint, ®ion, &painter); + if (!region.empty()) + { + painter.resetClip(region); + event(evtPaint, ®ion, &painter); + } painter.moveOffset(-position()); } +void eWidget::recalcClipRegionsWhenVisible() +{ + eWidget *t = this; + do + { + if (!(t->m_vis & wVisShow)) + break; + if (t->m_desktop) + { + t->m_desktop->recalcClipRegions(t); + break; + } + t = t->m_parent; + assert(t); + } while(1); +} + int eWidget::event(int event, void *data, void *data2) { switch (event) { case evtPaint: { - static int counter = 0x18; gPainter &painter = *(gPainter*)data2; -// eDebug("eWidget::evtPaint %d", counter); + +// eDebug("eWidget::evtPaint"); // dumpRegion(*(gRegion*)data); - painter.setBackgroundColor(gColor(++counter)); - painter.clear(); + 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(); + } break; } case evtKey: @@ -159,9 +294,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); +} +