git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
forgotten sdl-fix
[enigma2.git]
/
lib
/
gui
/
ewidget.cpp
diff --git
a/lib/gui/ewidget.cpp
b/lib/gui/ewidget.cpp
index 2241577ecc959a1c723479c07faa830ed136e3de..474e295d0d86830c99413e2d41c784c19032b5fa 100644
(file)
--- a/
lib/gui/ewidget.cpp
+++ b/
lib/gui/ewidget.cpp
@@
-9,6
+9,8
@@
eWidget::eWidget(eWidget *parent): m_parent(parent ? parent->child() : 0)
m_desktop = 0;
m_have_background_color = 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;
@@
-24,11
+26,11
@@
eWidget::eWidget(eWidget *parent): m_parent(parent ? parent->child() : 0)
void eWidget::move(ePoint pos)
{
void eWidget::move(ePoint pos)
{
+ m_position = pos + m_client_offset;
+
if (m_position == pos)
return;
if (m_position == pos)
return;
- 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
/* we invalidate before and after the move to
cause a correct redraw. The area which is
included both before and after isn't redrawn
@@
-49,11
+51,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);
@@
-153,11
+157,15
@@
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);
void eWidget::mayKillFocus()
{
setFocus(0);
@@
-264,7
+272,6
@@
int eWidget::event(int event, void *data, void *data2)
m_focus_owner = (eWidget*)data;
break;
case evtFocusLost:
m_focus_owner = (eWidget*)data;
break;
case evtFocusLost:
- eDebug("unhandled focus lost in %p", this);
m_focus_owner = 0;
break;
default:
m_focus_owner = 0;
break;
default:
@@
-275,7
+282,6
@@
int eWidget::event(int event, void *data, void *data2)
void eWidget::setFocus(eWidget *focus)
{
void eWidget::setFocus(eWidget *focus)
{
- eDebug("setFocus in %p to %p, was %p", this, focus, m_current_focus);
if (m_current_focus)
m_current_focus->event(evtFocusLost, this);
if (m_current_focus)
m_current_focus->event(evtFocusLost, this);