git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add slovene language, thanks to matej
[enigma2.git]
/
lib
/
gui
/
ewidget.cpp
diff --git
a/lib/gui/ewidget.cpp
b/lib/gui/ewidget.cpp
index 7c50f4af47344d2f0153c36d3de0062a0f19e12d..fea3524c8b717cdc51c70a57748461d4638413d2 100644
(file)
--- a/
lib/gui/ewidget.cpp
+++ b/
lib/gui/ewidget.cpp
@@
-6,15
+6,13
@@
extern void dumpRegion(const gRegion ®ion);
eWidget::eWidget(eWidget *parent): m_animation(this), m_parent(parent ? parent->child() : 0)
{
m_vis = 0;
eWidget::eWidget(eWidget *parent): m_animation(this), m_parent(parent ? parent->child() : 0)
{
m_vis = 0;
+ m_layer = 0;
m_desktop = 0;
m_have_background_color = 0;
m_z_position = 0;
m_desktop = 0;
m_have_background_color = 0;
m_z_position = 0;
-
m_client_offset = eSize(0, 0);
m_client_offset = eSize(0, 0);
-
if (m_parent)
m_vis = wVisShow;
if (m_parent)
m_vis = wVisShow;
-
if (m_parent)
{
insertIntoParent();
if (m_parent)
{
insertIntoParent();
@@
-23,12
+21,12
@@
eWidget::eWidget(eWidget *parent): m_animation(this), m_parent(parent ? parent->
m_current_focus = 0;
m_focus_owner = 0;
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;
}
void eWidget::move(ePoint pos)
{
pos = pos + m_client_offset;
-
if (m_position == pos)
return;
if (m_position == pos)
return;
@@
-36,10
+34,11
@@
void eWidget::move(ePoint pos)
invalidate();
m_position = pos;
invalidate();
m_position = pos;
-
event(evtChangedPosition);
event(evtChangedPosition);
- recalcClipRegionsWhenVisible();
-
+ if (m_notify_child_on_position_change)
+ for (ePtrList<eWidget>::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();
/* try native move if supported. */
if ((m_vis & wVisShow) && ((!m_desktop) || m_desktop->movedWidget(this)))
invalidate();
@@
-55,17
+54,20
@@
void eWidget::resize(eSize size)
only once. */
eSize old_size = m_size;
eSize old_offset = m_client_offset;
only once. */
eSize old_size = m_size;
eSize old_offset = m_client_offset;
+ m_client_size = size;
m_client_offset = eSize(0, 0);
event(evtWillChangeSize, &size, &m_client_offset);
if (old_size == m_size)
return;
m_client_offset = eSize(0, 0);
event(evtWillChangeSize, &size, &m_client_offset);
if (old_size == m_size)
return;
-
move(position() - old_offset);
move(position() - old_offset);
-
invalidate();
event(evtChangedSize);
invalidate();
event(evtChangedSize);
- recalcClipRegionsWhenVisible();
- invalidate();
+
+ if (m_notify_child_on_position_change)
+ for (ePtrList<eWidget>::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)
}
void eWidget::invalidate(const gRegion ®ion)
@@
-80,20
+82,22
@@
void eWidget::invalidate(const gRegion ®ion)
if (res.empty())
return;
if (res.empty())
return;
-
eWidget *root = this;
ePoint abspos = position();
eWidget *root = this;
ePoint abspos = position();
+ int target_layer = m_layer;
+
while (root && !root->m_desktop)
{
root = root->m_parent;
while (root && !root->m_desktop)
{
root = root->m_parent;
- assert(root);
+ ASSERT(root);
+ if (root->m_layer != -1)
+ target_layer = root->m_layer;
abspos += root->position();
}
abspos += root->position();
}
-
res.moveBy(abspos);
// eDebug("region to invalidate:");
// dumpRegion(res);
res.moveBy(abspos);
// eDebug("region to invalidate:");
// dumpRegion(res);
- root->m_desktop->invalidate(res);
+ root->m_desktop->invalidate(res
, this, target_layer
);
}
void eWidget::show()
}
void eWidget::show()
@@
-102,10
+106,14
@@
void eWidget::show()
return;
m_vis |= wVisShow;
return;
m_vis |= wVisShow;
-
+// eDebug("show widget %p", this);
+ notifyShowHide();
+
/* TODO: optimize here to only recalc what's required. possibly merge with hide. */
eWidget *root = this;
ePoint abspos = position();
/* TODO: optimize here to only recalc what's required. possibly merge with hide. */
eWidget *root = this;
ePoint abspos = position();
+ int target_layer = m_layer;
+
while (root && !root->m_desktop)
{
root = root->m_parent;
while (root && !root->m_desktop)
{
root = root->m_parent;
@@
-114,11
+122,12
@@
void eWidget::show()
/* oops: our root widget does not have a desktop associated.
probably somebody already erased the root, but tries some
operations on a child window.
/* 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); */
+ ignore them for now. */
+ /* ASSERT(root); */
return;
}
return;
}
+ if (root->m_layer != -1)
+ target_layer = root->m_layer;
abspos += root->position();
}
abspos += root->position();
}
@@
-126,7
+135,7
@@
void eWidget::show()
gRegion abs = m_visible_with_childs;
abs.moveBy(abspos);
gRegion abs = m_visible_with_childs;
abs.moveBy(abspos);
- root->m_desktop->invalidate(abs);
+ root->m_desktop->invalidate(abs
, this, target_layer
);
}
void eWidget::hide()
}
void eWidget::hide()
@@
-137,11
+146,12
@@
void eWidget::hide()
if (!(m_vis & wVisShow))
return;
m_vis &= ~wVisShow;
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;
/* 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;
+ notifyShowHide();
/* TODO: optimize here to only recalc what's required. possibly merge with show. */
eWidget *root = this;
/* TODO: optimize here to only recalc what's required. possibly merge with show. */
eWidget *root = this;
@@
-153,7
+163,7
@@
void eWidget::hide()
return;
abspos += root->position();
}
return;
abspos += root->position();
}
-
assert
(root->m_desktop);
+
ASSERT
(root->m_desktop);
gRegion abs = m_visible_with_childs;
abs.moveBy(abspos);
gRegion abs = m_visible_with_childs;
abs.moveBy(abspos);
@@
-185,18
+195,20
@@
void eWidget::setZPosition(int z)
m_z_position = z;
if (!m_parent)
return;
m_z_position = z;
if (!m_parent)
return;
-
m_parent->m_childs.remove(this);
m_parent->m_childs.remove(this);
-
insertIntoParent(); /* now at the new Z position */
}
void eWidget::setTransparent(int transp)
{
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()
}
ePoint eWidget::getAbsolutePosition()
@@
-207,7
+219,7
@@
ePoint eWidget::getAbsolutePosition()
while (root && !root->m_desktop)
{
root = root->m_parent;
while (root && !root->m_desktop)
{
root = root->m_parent;
-
assert
(root);
+
ASSERT
(root);
abspos += root->position();
}
abspos += root->position();
}
@@
-225,7
+237,6
@@
void eWidget::mayKillFocus()
eWidget::~eWidget()
{
hide();
eWidget::~eWidget()
{
hide();
-
if (m_parent)
m_parent->m_childs.remove(this);
if (m_parent)
m_parent->m_childs.remove(this);
@@
-243,7
+254,6
@@
eWidget::~eWidget()
void eWidget::insertIntoParent()
{
ePtrList<eWidget>::iterator i = m_parent->m_childs.begin();
void eWidget::insertIntoParent()
{
ePtrList<eWidget>::iterator i = m_parent->m_childs.begin();
-
for(;;)
{
if ((i == m_parent->m_childs.end()) || (i->m_z_position > m_z_position))
for(;;)
{
if ((i == m_parent->m_childs.end()) || (i->m_z_position > m_z_position))
@@
-255,31
+265,29
@@
void eWidget::insertIntoParent()
}
}
}
}
-void eWidget::doPaint(gPainter &painter, const gRegion &r)
+void eWidget::doPaint(gPainter &painter, const gRegion &r
, int layer
)
{
if (m_visible_with_childs.empty())
return;
{
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());
gRegion region = r, childs = r;
/* we were in parent's space, now we are in local space */
region.moveBy(-position());
-
painter.moveOffset(position());
painter.moveOffset(position());
-
/* check if there's anything for us to paint */
/* check if there's anything for us to paint */
- region &= m_visible_region;
-
- if (!region.empty())
+ if (layer == m_layer)
{
{
- painter.resetClip(region);
- event(evtPaint, ®ion, &painter);
+ region &= m_visible_region;
+ if (!region.empty())
+ {
+ painter.resetClip(region);
+ event(evtPaint, ®ion, &painter);
+ }
}
childs.moveBy(-position());
/* walk all childs */
for (ePtrList<eWidget>::iterator i(m_childs.begin()); i != m_childs.end(); ++i)
}
childs.moveBy(-position());
/* walk all childs */
for (ePtrList<eWidget>::iterator i(m_childs.begin()); i != m_childs.end(); ++i)
- i->doPaint(painter, childs);
-
+ i->doPaint(painter, childs, layer);
painter.moveOffset(-position());
}
painter.moveOffset(-position());
}
@@
-296,7
+304,7
@@
void eWidget::recalcClipRegionsWhenVisible()
break;
}
t = t->m_parent;
break;
}
t = t->m_parent;
-
assert
(t);
+
ASSERT
(t);
} while(1);
}
} while(1);
}
@@
-312,8
+320,7
@@
int eWidget::event(int event, void *data, void *data2)
case evtPaint:
{
gPainter &painter = *(gPainter*)data2;
case evtPaint:
{
gPainter &painter = *(gPainter*)data2;
-
-// eDebug("eWidget::evtPaint");
+ // eDebug("eWidget::evtPaint");
// dumpRegion(*(gRegion*)data);
if (!isTransparent())
{
// dumpRegion(*(gRegion*)data);
if (!isTransparent())
{
@@
-329,8
+336,12
@@
int eWidget::event(int event, void *data, void *data2)
}
} else
{
}
} else
{
- if (m_have_background_color)
- painter.setBackgroundColor(m_background_color);
+ eWidget *w = this;
+ while (w && !w->m_have_background_color)
+ w = w->m_parent;
+
+ if (w)
+ painter.setBackgroundColor(w->m_background_color);
}
break;
}
}
break;
}
@@
-340,10
+351,12
@@
int eWidget::event(int event, void *data, void *data2)
m_size = *static_cast<eSize*>(data);
break;
case evtChangedSize:
m_size = *static_cast<eSize*>(data);
break;
case evtChangedSize:
- {
m_clip_region = gRegion(eRect(ePoint(0, 0), m_size));
break;
m_clip_region = gRegion(eRect(ePoint(0, 0), m_size));
break;
- }
+ case evtParentChangedPosition:
+ for (ePtrList<eWidget>::iterator i(m_childs.begin()); i != m_childs.end(); ++i)
+ i->event(evtParentChangedPosition);
+ break;
case evtFocusGot:
m_focus_owner = (eWidget*)data;
break;
case evtFocusGot:
m_focus_owner = (eWidget*)data;
break;
@@
-360,10
+373,15
@@
void eWidget::setFocus(eWidget *focus)
{
if (m_current_focus)
m_current_focus->event(evtFocusLost, this);
{
if (m_current_focus)
m_current_focus->event(evtFocusLost, this);
-
m_current_focus = focus;
if (m_current_focus)
m_current_focus->event(evtFocusGot, this);
}
m_current_focus = focus;
if (m_current_focus)
m_current_focus->event(evtFocusGot, this);
}
+void eWidget::notifyShowHide()
+{
+ event(evtParentVisibilityChanged);
+ for (ePtrList<eWidget>::iterator i(m_childs.begin()); i != m_childs.end(); ++i)
+ i->notifyShowHide();
+}