X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ba02fb4aced5868d047a5bffbd2ed87583daee4d..68b9abe0ee621954569f4c6920c1972f9c0ade3f:/lib/gui/ewidget.cpp

diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp
index 3ebac357..8cb7d4ae 100644
--- a/lib/gui/ewidget.cpp
+++ b/lib/gui/ewidget.cpp
@@ -3,10 +3,13 @@
 
 extern void dumpRegion(const gRegion &region);
 
-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_client_offset = eSize(0, 0);
 	
 	if (m_parent)
 		m_vis = wVisShow;
@@ -16,24 +19,26 @@ eWidget::eWidget(eWidget *parent): m_parent(parent ? parent->child() : 0)
 		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)
 {
+	pos = pos + m_client_offset;
+	
 	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
-		   twice because a invalidate doesn't immediately
-		   redraws the region. */
-	invalidate();
 	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)
@@ -45,10 +50,14 @@ void eWidget::resize(eSize size)
 		   fits into the other completely, and invalidate
 		   only once. */
 	eSize old_size = m_size;
-	event(evtWillChangeSize, &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();	
@@ -100,7 +109,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);
@@ -109,7 +118,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;
@@ -124,7 +143,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);
 }
 
@@ -135,11 +154,34 @@ 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::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<eWidget>::iterator i(m_childs.begin());
 	while (i != m_childs.end())
@@ -185,7 +227,7 @@ void eWidget::recalcClipRegionsWhenVisible()
 			break;
 		if (t->m_desktop)
 		{
-			t->m_desktop->recalcClipRegions();
+			t->m_desktop->recalcClipRegions(t);
 			break;
 		}
 		t = t->m_parent;
@@ -203,9 +245,16 @@ int eWidget::event(int event, void *data, void *data2)
 		
 //		eDebug("eWidget::evtPaint");
 //		dumpRegion(*(gRegion*)data);
-		ePtr<eWindowStyle> style;
-		if (!getStyle(style))
-			style->paintBackground(painter, ePoint(0, 0), size());
+		if (!m_have_background_color)
+		{
+			ePtr<eWindowStyle> style;
+			if (!getStyle(style))
+				style->paintBackground(painter, ePoint(0, 0), size());
+		} else
+		{
+			painter.setBackgroundColor(m_background_color);
+			painter.clear();
+		}
 		break;
 	}
 	case evtKey:
@@ -218,9 +267,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);
+}
+