3 files changed, 19 insertions, 40 deletions

diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index 5b00dea..03f3c1c 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -13,12 +13,12 @@ using namespace Opie::Core;
 ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name, WFlags fl )
     : Opie::MM::OImageScrollView(parent,name,fl)
 {
     m_viewManager = 0;
-    m_focus_out = false;
-    block_next_focus = true;
+    focus_in_count = 0;
     m_cfg = cfg;
     m_isFullScreen = false;
+    m_ignore_next_in = false;
     QPEApplication::setStylusOperation(viewport(),QPEApplication::RightOnHold);
     initKeys();
 }
 
@@ -106,9 +106,8 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e)
 {
     if (e->button()==1) {
         return OImageScrollView::contentsMousePressEvent(e);
     }
-//    if (!fullScreen()) return;
     odebug << "Popup " << oendl;
     QPopupMenu *m = new QPopupMenu(0);
     if (!m) return;
     bool old = fullScreen();
@@ -124,12 +123,8 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e)
     }
     m->setFocus();
     m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
     delete m;
-    /* if we were fullScreen() and must overlap the taskbar again */
-    if (fullScreen() && old) {
-          enableFullscreen();
-    }
 }
 
 void ImageView::setFullScreen(bool how)
 {
@@ -138,48 +133,36 @@ void ImageView::setFullScreen(bool how)
 
 void ImageView::focusInEvent(QFocusEvent *)
 {
       // Always do it here, no matter the size.
-    odebug << "Focus in" << oendl;
-}
-
-void ImageView::focusOutEvent(QFocusEvent *)
-{
-    odebug << "Focus out" << oendl;
+    odebug << "Focus in (view)" << oendl;
+    //if (fullScreen()) parentWidget()->showNormal();
+    if (m_ignore_next_in){m_ignore_next_in=false;return;}
+    if (fullScreen()) enableFullscreen();
 }
 
 void ImageView::enableFullscreen()
 {
       // This call is needed because showFullScreen won't work
       // correctly if the widget already considers itself to be fullscreen.
+      if (!fullScreen()) return;
+      if (m_ignore_next_in) {m_ignore_next_in = false;return;}
+
       setUpdatesEnabled(false);
-      odebug << "showNormal();" << oendl;
       parentWidget()->showNormal();
-      odebug << "showNormal(); done " << oendl;
       // This is needed because showNormal() forcefully changes the window
       // style to WSTyle_TopLevel.
-      odebug << " reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));" << oendl;
       parentWidget()->reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));
-      odebug << " reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0)); done" << oendl;
       // Enable fullscreen.
-      odebug << "showFullScreen();" << oendl;
+      /* this is the trick - I don't now why, but after a showFullScreen QTE toggles the focus
+       * so we must block it here! */
+      m_ignore_next_in = true;
       parentWidget()->showFullScreen();
-      odebug << "showFullScreen(); done" << oendl;
       setUpdatesEnabled(true);
 }
 
-void ImageWidget::show()
-{
-    QWidget::show();
-}
-
-void ImageWidget::hide()
-{
-    QWidget::hide();
-}
-
 ImageWidget::ImageWidget(QWidget * parent, const char * name, WFlags f)
     : QWidget(parent,name,f)
 {
-      // Make sure size is correct
-      setFixedSize(qApp->desktop()->size());
+    // Make sure size is correct
+    setFixedSize(qApp->desktop()->size());
 }
diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h
index 5f15bc9..f3c37b5 100644
--- a/noncore/graphics/opie-eye/gui/imageview.h
+++ b/noncore/graphics/opie-eye/gui/imageview.h
@@ -30,10 +30,10 @@ public:
     ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name = 0, WFlags fl = 0 );
     virtual ~ImageView();
     Opie::Core::OKeyConfigManager* manager();
     void setFullScreen(bool how);
-    virtual void enableFullscreen();
     bool fullScreen(){return m_isFullScreen;}
+    virtual void enableFullscreen();
 
 signals:
     void dispImageInfo(const QString&);
     void dispNext();
@@ -48,13 +48,12 @@ protected:
     Opie::Core::OConfig * m_cfg;
     Opie::Core::OKeyConfigManager*m_viewManager;
     void initKeys();
     bool m_isFullScreen:1;
-    bool m_focus_out:1;
-    bool block_next_focus:1;
-
+    bool m_ignore_next_in:1;
+    int focus_in_count;
     virtual void focusInEvent ( QFocusEvent * );
-    virtual void focusOutEvent ( QFocusEvent * );
+
 
 protected slots:
     virtual void slotShowImageInfo();
     virtual void keyReleaseEvent(QKeyEvent * e);
@@ -70,10 +69,8 @@ public:
 
 protected:
 
 public slots:
-    virtual void show();
-    virtual void hide();
 
 protected slots:
 };
 
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index fa1680c..cdaf34c 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -397,10 +397,9 @@ void PMainWindow::slotDisplay( const QString& inf ) {
         fsButton->hide();
         viewModeButton->hide();
     }
     if (m_disp->fullScreen()) {
-//        tFrame->showFullScreen();
-        m_disp->enableFullscreen();
+        tFrame->show();//FullScreen();
     } else {
         m_stack->raiseWidget( ImageDisplay );
     }
 }