4 files changed, 19 insertions, 2 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index 8e7f982..ee4b0a1 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -68,2 +68,3 @@ void ImageView::keyReleaseEvent(QKeyEvent * e)
     if (e->key()==Qt::Key_F) emit toggleFullScreen();
+    if (e->key()==Qt::Key_Escape && fullScreen()) emit hideMe();
 }
diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h
index 32f7e11..75f798c 100644
--- a/noncore/graphics/opie-eye/gui/imageview.h
+++ b/noncore/graphics/opie-eye/gui/imageview.h
@@ -33,2 +33,3 @@ signals:
     void toggleFullScreen();
+    void hideMe();
 
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 9b929a1..ef6e6df 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -286,2 +286,3 @@ void PMainWindow::initDisp() {
         connect(m_disp,SIGNAL(toggleFullScreen()),this,SLOT(slotToggleFullScreen()));
+        connect(m_disp,SIGNAL(hideMe()),this,SLOT(raiseIconView()));
     }
@@ -300,2 +301,4 @@ void PMainWindow::slotToggleFullScreen()
         m_disp->reparent(0,QPoint(0,0));
+        m_disp->setVScrollBarMode(QScrollView::AlwaysOff);
+        m_disp->setHScrollBarMode(QScrollView::AlwaysOff);
         m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height());
@@ -306,2 +309,4 @@ void PMainWindow::slotToggleFullScreen()
         m_stack->addWidget(m_disp,ImageDisplay);
+        m_disp->setVScrollBarMode(QScrollView::Auto);
+        m_disp->setHScrollBarMode(QScrollView::Auto);
         m_stack->raiseWidget(m_disp);
@@ -333,2 +338,5 @@ void PMainWindow::slotShowInfo( const QString& inf ) {
     }
+    if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
+        m_disp->hide();
+    }
     m_stack->raiseWidget( ImageInfo );
@@ -348,3 +356,7 @@ void PMainWindow::slotDisplay( const QString& inf ) {
     }
-    m_stack->raiseWidget( ImageDisplay );
+    if (m_disp->fullScreen()) {
+        m_disp->show();
+    } else {
+        m_stack->raiseWidget( ImageDisplay );
+    }
 }
@@ -379,2 +391,5 @@ void PMainWindow::raiseIconView() {
     }
+    if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
+        m_disp->hide();
+    }
     m_stack->raiseWidget( IconView );
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h
index 4cfc39c..d238763 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.h
+++ b/noncore/graphics/opie-eye/gui/mainwindow.h
@@ -48,3 +48,3 @@ public slots:
 
-protected:
+protected slots:
     void raiseIconView();