git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eListboxPythonConfigContent: handle AnwenderFehler more gracefully
[enigma2.git]
/
lib
/
gui
/
ewidget.cpp
diff --git
a/lib/gui/ewidget.cpp
b/lib/gui/ewidget.cpp
index 3ba248ff5eda6f81cdcf7d80513c6a7db28d7ad0..8cb7d4ae0f4fdd15dbd000df2655207cf83b9ee7 100644
(file)
--- a/
lib/gui/ewidget.cpp
+++ b/
lib/gui/ewidget.cpp
@@
-3,38
+3,42
@@
extern void dumpRegion(const gRegion ®ion);
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_vis = 0;
m_desktop = 0;
m_have_background_color = 0;
+ m_client_offset = eSize(0, 0);
+
if (m_parent)
m_vis = wVisShow;
if (m_parent)
m_vis = wVisShow;
-
+
if (m_parent)
{
m_parent->m_childs.push_back(this);
m_parent->getStyle(m_style);
}
if (m_parent)
{
m_parent->m_childs.push_back(this);
m_parent->getStyle(m_style);
}
+
+ m_current_focus = 0;
+ m_focus_owner = 0;
}
void eWidget::move(ePoint pos)
{
}
void eWidget::move(ePoint pos)
{
+ pos = pos + m_client_offset;
+
if (m_position == pos)
return;
if (m_position == pos)
return;
-
+
m_position = pos;
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);
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)
}
void eWidget::resize(eSize size)
@@
-46,11
+50,13
@@
void eWidget::resize(eSize size)
fits into the other completely, and invalidate
only once. */
eSize old_size = m_size;
fits into the other completely, and invalidate
only once. */
eSize old_size = m_size;
- eSize offset = eSize(0, 0);
- event(evtWillChangeSize, &size, &offset);
+ eSize old_offset = m_client_offset;
+ m_client_offset = eSize(0, 0);
+ event(evtWillChangeSize, &size, &m_client_offset);
if (old_size == m_size)
return;
if (old_size == m_size)
return;
- move(position() + offset);
+
+ move(position() - old_offset);
invalidate();
event(evtChangedSize);
invalidate();
event(evtChangedSize);
@@
-103,7
+109,7
@@
void eWidget::show()
abspos += root->position();
}
abspos += root->position();
}
- root->m_desktop->recalcClipRegions();
+ root->m_desktop->recalcClipRegions(
root
);
gRegion abs = m_visible_with_childs;
abs.moveBy(abspos);
gRegion abs = m_visible_with_childs;
abs.moveBy(abspos);
@@
-137,7
+143,7
@@
void eWidget::hide()
gRegion abs = m_visible_with_childs;
abs.moveBy(abspos);
gRegion abs = m_visible_with_childs;
abs.moveBy(abspos);
- root->m_desktop->recalcClipRegions();
+ root->m_desktop->recalcClipRegions(
root
);
root->m_desktop->invalidate(abs);
}
root->m_desktop->invalidate(abs);
}
@@
-150,11
+156,23
@@
void eWidget::destruct()
void eWidget::setBackgroundColor(const gRGB &col)
{
void eWidget::setBackgroundColor(const gRGB &col)
{
- eDebug("set background color in ewidget!");
m_background_color = col;
m_have_background_color = 1;
}
m_background_color = col;
m_have_background_color = 1;
}
+void eWidget::clearBackgroundColor()
+{
+ m_have_background_color = 0;
+}
+
+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();
eWidget::~eWidget()
{
hide();
@@
-209,7
+227,7
@@
void eWidget::recalcClipRegionsWhenVisible()
break;
if (t->m_desktop)
{
break;
if (t->m_desktop)
{
- t->m_desktop->recalcClipRegions();
+ t->m_desktop->recalcClipRegions(
t
);
break;
}
t = t->m_parent;
break;
}
t = t->m_parent;
@@
-249,9
+267,26
@@
int eWidget::event(int event, void *data, void *data2)
m_clip_region = gRegion(eRect(ePoint(0, 0), m_size));
break;
}
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;
}
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);
+}
+