git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try to fix *some* of the bugs. Something is still odd.
[enigma2.git]
/
lib
/
gui
/
ewidget.cpp
diff --git
a/lib/gui/ewidget.cpp
b/lib/gui/ewidget.cpp
index 26ccfba394b0f790f0aa233d01ad0a04064d2085..30602c558ca238acc6c59c9a3d648cb2e2237f6c 100644
(file)
--- a/
lib/gui/ewidget.cpp
+++ b/
lib/gui/ewidget.cpp
@@
-23,6
+23,8
@@
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)
}
void eWidget::move(ePoint pos)
@@
-32,9
+34,17
@@
void eWidget::move(ePoint pos)
if (m_position == pos)
return;
if (m_position == pos)
return;
+ /* ?? what about native move support? */
+ invalidate();
+
m_position = pos;
event(evtChangedPosition);
m_position = pos;
event(evtChangedPosition);
+
+ 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. */
recalcClipRegionsWhenVisible();
/* try native move if supported. */
@@
-61,6
+71,11
@@
void eWidget::resize(eSize size)
invalidate();
event(evtChangedSize);
invalidate();
event(evtChangedSize);
+
+ 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();
}
recalcClipRegionsWhenVisible();
invalidate();
}
@@
-97,16
+112,25
@@
void eWidget::show()
{
if (m_vis & wVisShow)
return;
{
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;
/* 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();
}
abspos += root->position();
}
@@
-137,6
+161,8
@@
void eWidget::hide()
while (root && !root->m_desktop)
{
root = root->m_parent;
while (root && !root->m_desktop)
{
root = root->m_parent;
+ if (!root)
+ return;
abspos += root->position();
}
assert(root->m_desktop);
abspos += root->position();
}
assert(root->m_desktop);
@@
-185,6
+211,21
@@
void eWidget::setTransparent(int transp)
m_vis &=~wVisTransparent;
}
m_vis &=~wVisTransparent;
}
+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);
void eWidget::mayKillFocus()
{
setFocus(0);
@@
-202,12
+243,11
@@
eWidget::~eWidget()
m_parent = 0;
m_parent = 0;
- /*
destroy all childs
*/
+ /*
tell all childs that the parent is not anymore existing
*/
ePtrList<eWidget>::iterator i(m_childs.begin());
while (i != m_childs.end())
{
ePtrList<eWidget>::iterator i(m_childs.begin());
while (i != m_childs.end())
{
- (*i)->m_parent = 0;
- delete *i;
+ (*i)->parentRemoved();
i = m_childs.erase(i);
}
}
i = m_childs.erase(i);
}
}
@@
-272,6
+312,11
@@
void eWidget::recalcClipRegionsWhenVisible()
} while(1);
}
} while(1);
}
+void eWidget::parentRemoved()
+{
+ m_parent = 0;
+}
+
int eWidget::event(int event, void *data, void *data2)
{
switch (event)
int eWidget::event(int event, void *data, void *data2)
{
switch (event)
@@
-296,8
+341,13
@@
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;
}
@@
-307,10
+357,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;