dirty hack let opie-eye crash

fixed display problems the right way now I hope
ToDo:
fix flicker when switching images in fullscreen mode while window is
visible

2 files changed, 8 insertions, 21 deletions

diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index 03df321..6c3f9cb 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -278,3 +278,3 @@ void ImageView::enableFullscreen()
       // style to WSTyle_TopLevel.
-      reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));
+      reparent(0, WStyle_Customize | WStyle_NoBorderEx, QPoint(0,0));
       // Enable fullscreen.
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 3a89dfd..d11e4e1 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -309,3 +309,3 @@ void PMainWindow::setupViewWindow(bool current, bool forceDisplay)
         m_disp->setBackgroundColor(black);
-        m_disp->reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));
+        m_disp->reparent(0, WStyle_Customize | WStyle_NoBorderEx, QPoint(0,0));
         m_disp->setVScrollBarMode(QScrollView::AlwaysOff);
@@ -377,11 +377,2 @@ void PMainWindow::slotDisplay( const QString& inf ) {
     bool nwindow = false;
-    bool disp_hack = false;
-    int lb;
-    if (m_disp && m_disp->fullScreen()) {
-        lb = m_disp->Intensity();
-        delete m_disp;
-        m_disp = 0;
-
-        disp_hack = true;
-    }
     if ( !m_disp ) {
@@ -389,13 +380,6 @@ void PMainWindow::slotDisplay( const QString& inf ) {
         initDisp();
-        m_disp->setIntensity((disp_hack?lb:m_Intensity));
+        m_disp->setIntensity(m_Intensity);
+        m_setCurrentBrightness->setEnabled(true);
     }
-    m_setCurrentBrightness->setEnabled(true);
-
-    Opie::Ui::OWait wdlg;
-    wdlg.setTimerLength(30);
-    wdlg.show();
-    //qApp->processEvents(20);
     m_disp->setImage( inf );
-    wdlg.hide();
-    //qApp->processEvents(20);
     if (m_SmallWindow) {
@@ -416,3 +400,6 @@ void PMainWindow::slotDisplay( const QString& inf ) {
     if (m_disp->fullScreen()) {
-        qwsDisplay()->requestFocus( m_disp->winId(), TRUE);
+        if (!m_disp->isVisible()) {
+            m_disp->showFullScreen();
+            qwsDisplay()->requestFocus( m_disp->winId(), TRUE);
+        }
     } else {