1 files changed, 7 insertions, 17 deletions

diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index cdaf34c..274a22a 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -35,3 +35,2 @@
 
-
 //OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" )
@@ -45,3 +44,2 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
     m_cfg->setGroup("Zecke_view" );
-    tFrame = 0;
 //    qDebug( "Process-wide OApplication object @ %0x", oApp );
@@ -148,5 +146,2 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
 PMainWindow::~PMainWindow() {
-    odebug << "Shutting down" << oendl;
-    if (tFrame) delete tFrame;
-    odebug << "Shutting down done" << oendl;
 }
@@ -327,3 +322,2 @@ void PMainWindow::slotToggleFullScreen()
     bool current = !m_disp->fullScreen();
-    m_disp->setFullScreen(current);
     odebug << "Current = " << current << oendl;
@@ -332,8 +326,3 @@ void PMainWindow::slotToggleFullScreen()
         m_disp->setBackgroundColor(black);
-        if (!tFrame) {
-            tFrame = new ImageWidget(0,0,WStyle_Customize|WStyle_NoBorder);
-            tFrame->resize(qApp->desktop()->width(), qApp->desktop()->height());
-            tFrame->setMinimumSize(qApp->desktop()->width(), qApp->desktop()->height());
-        }
-        m_disp->reparent(tFrame,QPoint(0,0));
+        m_disp->reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));
         m_disp->setVScrollBarMode(QScrollView::AlwaysOff);
@@ -341,3 +330,4 @@ void PMainWindow::slotToggleFullScreen()
         m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height());
-        tFrame->showFullScreen();
+        //m_disp->showFullScreen();
+        //qwsDisplay()->requestFocus( m_disp->winId(), TRUE);
     } else {
@@ -347,4 +337,2 @@ void PMainWindow::slotToggleFullScreen()
         m_disp->showNormal();
-        /* don't forget it! */
-        tFrame->hide();
         m_disp->setBackgroundColor(white);
@@ -359,2 +347,3 @@ void PMainWindow::slotToggleFullScreen()
     }
+    m_disp->setFullScreen(current);
 }
@@ -400,3 +389,4 @@ void PMainWindow::slotDisplay( const QString& inf ) {
     if (m_disp->fullScreen()) {
-        tFrame->show();//FullScreen();
+        //m_disp->showFullScreen();
+        qwsDisplay()->requestFocus( m_disp->winId(), TRUE);
     } else {
@@ -441,3 +431,3 @@ void PMainWindow::raiseIconView() {
     if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
-        tFrame->hide();
+        m_disp->hide();
     }