X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fgui%2Fewindow.cpp;h=83e65ec3d21a0e05aad092c92cb1e45f3924ae6b;hp=e637cf22078753588c0f6131301d8d11949af7e5;hb=36cca1d3f31265929ef3443999ab7fd242b4dae5;hpb=92f02a487b375ae936e7fa74b060bee9d495a106

diff --git a/lib/gui/ewindow.cpp b/lib/gui/ewindow.cpp
index e637cf2..83e65ec 100644
--- a/lib/gui/ewindow.cpp
+++ b/lib/gui/ewindow.cpp
@@ -6,33 +6,37 @@
 
 #include <lib/gdi/epng.h>
 
-eWindow::eWindow(eWidgetDesktop *desktop): eWidget(0)
+eWindow::eWindow(eWidgetDesktop *desktop, int z): eWidget(0)
 {
 	m_flags = 0;
+	m_desktop = desktop;
 		/* ask style manager for current style */
 	ePtr<eWindowStyleManager> mgr;
 	eWindowStyleManager::getInstance(mgr);
 	
 	ePtr<eWindowStyle> style;
 	if (mgr)
-		mgr->getStyle(style);
+		mgr->getStyle(desktop->getStyleID(), style);
 	
 		/* when there is either no style manager or no style, revert to simple style. */
 	if (!style)
 		style = new eWindowStyleSimple();
 	
 	setStyle(style);
+	
+	setZPosition(z); /* must be done before addRootWidget */
 
 		/* we are the parent for the child window. */
 		/* as we are in the constructor, this is thread safe. */
 	m_child = this;
 	m_child = new eWidget(this);
-	desktop->addRootWidget(this, 0);
+	desktop->addRootWidget(this);
 }
 
 eWindow::~eWindow()
 {
-	getDesktop()->removeRootWidget(this);
+	m_desktop->removeRootWidget(this);
+	m_child->destruct();
 }
 
 void eWindow::setTitle(const std::string &string)
@@ -43,6 +47,18 @@ void eWindow::setTitle(const std::string &string)
 	event(evtTitleChanged);
 }
 
+std::string eWindow::getTitle() const
+{
+	return m_title;
+}
+
+void eWindow::setBackgroundColor(const gRGB &col)
+{
+		/* set background color for child, too */
+	eWidget::setBackgroundColor(col);
+	m_child->setBackgroundColor(col);
+}
+
 void eWindow::setFlag(int flags)
 {
 	m_flags |= flags;
@@ -86,6 +102,12 @@ int eWindow::event(int event, void *data, void *data2)
 		}
 		return 0;
 	}
+	case evtTitleChanged:
+			/* m_visible_region contains, in contrast to m_visible_with_childs,
+			   only the decoration. though repainting the whole decoration is bad,
+			   repainting the whole window is even worse. */
+		invalidate(m_visible_region);
+		break;
 	default:
 		break;
 	}