X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6b7b7977a92c9a092763bf699cba85347f9f2ec6..db6ca522bdfbde29c214b41435a10876ff72a0a4:/lib/gui/ewindow.cpp

diff --git a/lib/gui/ewindow.cpp b/lib/gui/ewindow.cpp
index 1114d258..f8984729 100644
--- a/lib/gui/ewindow.cpp
+++ b/lib/gui/ewindow.cpp
@@ -2,21 +2,40 @@
 #include <lib/gui/ewidgetdesktop.h>
 
 #include <lib/gui/ewindowstyle.h>
+#include <lib/gui/ewindowstyleskinned.h>
 
-eWindow::eWindow(eWidgetDesktop *desktop): eWidget(0)
+#include <lib/gdi/epng.h>
+
+eWindow::eWindow(eWidgetDesktop *desktop, int z): eWidget(0)
 {
-	setStyle(new eWindowStyleSimple());
+	m_flags = 0;
+		/* ask style manager for current style */
+	ePtr<eWindowStyleManager> mgr;
+	eWindowStyleManager::getInstance(mgr);
+	
+	ePtr<eWindowStyle> style;
+	if (mgr)
+		mgr->getStyle(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_child->destruct();
 }
 
 void eWindow::setTitle(const std::string &string)
@@ -27,32 +46,60 @@ void eWindow::setTitle(const std::string &string)
 	event(evtTitleChanged);
 }
 
+std::string eWindow::getTitle() const
+{
+	return m_title;
+}
+
+void eWindow::setFlag(int flags)
+{
+	m_flags |= flags;
+}
+
+void eWindow::clearFlag(int flags)
+{
+	m_flags &= ~flags;
+}
+
 int eWindow::event(int event, void *data, void *data2)
 {
 	switch (event)
 	{
 	case evtWillChangeSize:
 	{
-		ePtr<eWindowStyle> style;
-		if (!getStyle(style))
+		eSize &new_size = *static_cast<eSize*>(data);
+		eSize &offset = *static_cast<eSize*>(data2);
+		if (!(m_flags & wfNoBorder))
 		{
-			const eSize &new_size = *static_cast<eSize*>(data);
+			ePtr<eWindowStyle> style;
+			if (!getStyle(style))
+			{
 //			eDebug("eWindow::evtWillChangeSize to %d %d", new_size.width(), new_size.height());
-			style->handleNewSize(this, new_size);
-		}
+				style->handleNewSize(this, new_size, offset);
+			}
+		} else
+			m_child->resize(new_size);
 		break;
 	}
 	case evtPaint:
 	{
-		ePtr<eWindowStyle> style;
-		if (!getStyle(style))
+		if (!(m_flags & wfNoBorder))
 		{
-			gPainter &painter = *static_cast<gPainter*>(data2);
-			style->paintWindowDecoration(this, painter, m_title);
-		} else
-			eDebug("no style :(");
+			ePtr<eWindowStyle> style;
+			if (!getStyle(style))
+			{
+				gPainter &painter = *static_cast<gPainter*>(data2);
+				style->paintWindowDecoration(this, painter, m_title);
+			}
+		}
 		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;
 	}