fix ewidget::show() (fixes the BlinkingWidget)

[enigma2.git] / lib / gui / ewindow.cpp

diff --git a/lib/gui/ewindow.cpp b/lib/gui/ewindow.cpp
index 54a359582327698d6c24227cdf2b6fde4bfcbeff..112b82d74bb7cf84710cb5157d5ab836b6f25152 100644 (file)
--- a/lib/gui/ewindow.cpp
+++ b/lib/gui/ewindow.cpp
@@ -6,9 +6,10 @@
 
 #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);
@@ -22,17 +23,20 @@ eWindow::eWindow(eWidgetDesktop *desktop): eWidget(0)
                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)