summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp53
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.h2
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp7
3 files changed, 49 insertions, 13 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index 5b34ca2..53376c0 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -102,30 +102,59 @@ void ImageView::slotShowImageInfo()
void ImageView::contentsMousePressEvent ( QMouseEvent * e)
{
if (e->button()==1) {
return OImageScrollView::contentsMousePressEvent(e);
}
- if (!fullScreen()) return;
-#if 0
- // doesn't work right (repainting problems)
+// if (!fullScreen()) return;
odebug << "Popup " << oendl;
QPopupMenu *m = new QPopupMenu(0);
if (!m) return;
- m->insertItem(tr("Previous image"),ShowPrevious);
- m->insertItem(tr("Next image"),ShowNext);
- m->insertSeparator();
- m->insertItem(tr("Toggle fullscreen"),FullScreen);
- m->insertItem(tr("Toggle autoscale"),Autoscale);
- m->insertItem(tr("Toggle autorotate"),Autorotate);
- m->insertItem(tr("Toggle thumbnail"),Zoomer);
+ bool old = fullScreen();
+ m->insertItem(tr("Toggle fullscreen"),this, SIGNAL(toggleFullScreen()));
+ if (fullScreen()) {
+ m->insertSeparator();
+ m->insertItem(tr("Previous image"),this,SIGNAL(dispPrev()));
+ m->insertItem(tr("Next image"),this,SIGNAL(dispNext()));
+ m->insertSeparator();
+ m->insertItem(tr("Toggle autoscale"),this, SIGNAL(toggleAutoscale()));
+ m->insertItem(tr("Toggle autorotate"),this, SIGNAL(toggleAutorotate()));
+ m->insertItem(tr("Toggle thumbnail"),this, SIGNAL(toggleZoomer()));
+ }
m->setFocus();
m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
delete m;
- parentWidget()->showFullScreen();
-#endif
+ /* if we were fullScreen() and must overlap the taskbar again */
+ if (fullScreen() && old) {
+ enableFullscreen();
+// parentWidget()->hide();
+// parentWidget()->show();
+ }
}
void ImageView::setFullScreen(bool how)
{
m_isFullScreen = how;
}
+
+void ImageView::focusInEvent(QFocusEvent *)
+{
+ // Always do it here, no matter the size.
+ /* result in an endless loop */
+// if (fullScreen()) enableFullscreen();
+}
+
+void ImageView::enableFullscreen()
+{
+ if (!fullScreen()) return;
+ // Make sure size is correct
+ parentWidget()->setFixedSize(qApp->desktop()->size());
+ // This call is needed because showFullScreen won't work
+ // correctly if the widget already considers itself to be fullscreen.
+ parentWidget()->showNormal();
+ // This is needed because showNormal() forcefully changes the window
+ // style to WSTyle_TopLevel.
+ parentWidget()->reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));
+ // Enable fullscreen.
+ parentWidget()->showFullScreen();
+}
+
diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h
index 445bee9..4d2405f 100644
--- a/noncore/graphics/opie-eye/gui/imageview.h
+++ b/noncore/graphics/opie-eye/gui/imageview.h
@@ -43,14 +43,16 @@ signals:
protected:
Opie::Core::OConfig * m_cfg;
Opie::Core::OKeyConfigManager*m_viewManager;
void initKeys();
bool m_isFullScreen:1;
+ void enableFullscreen();
protected slots:
virtual void slotShowImageInfo();
virtual void keyReleaseEvent(QKeyEvent * e);
virtual void contentsMousePressEvent ( QMouseEvent * e);
+ virtual void focusInEvent ( QFocusEvent * );
};
#endif
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index a784f5b..58f02ef 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -326,22 +326,23 @@ void PMainWindow::slotToggleFullScreen()
m_disp->setFullScreen(current);
odebug << "Current = " << current << oendl;
if (current) {
odebug << "full" << oendl;
m_disp->setBackgroundColor(black);
if (!tFrame) {
- tFrame = new QWidget(0,0,WType_TopLevel|WStyle_NoBorder|WStyle_StaysOnTop);
+ tFrame = new QWidget(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->setVScrollBarMode(QScrollView::AlwaysOff);
m_disp->setHScrollBarMode(QScrollView::AlwaysOff);
m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height());
tFrame->showFullScreen();
} else {
+ setUpdatesEnabled(false);
odebug << "window" << oendl;
m_disp->reparent(0,QPoint(0,0));
m_disp->showNormal();
/* don't forget it! */
tFrame->hide();
m_disp->setBackgroundColor(white);
@@ -349,12 +350,13 @@ void PMainWindow::slotToggleFullScreen()
m_disp->setVScrollBarMode(QScrollView::Auto);
m_disp->setHScrollBarMode(QScrollView::Auto);
m_stack->raiseWidget(m_disp);
if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
m_disp->resize(m_disp->minimumSize());
}
+ setUpdatesEnabled(true);
}
}
/**
* With big Screen the plan could be to 'detach' the image
* window if visible and to create a ne wone
@@ -424,23 +426,26 @@ void PMainWindow::closeEvent( QCloseEvent* ev ) {
}
ev->accept();
QTimer::singleShot(0, qApp, SLOT(closeAllWindows()));
}
void PMainWindow::raiseIconView() {
+ setUpdatesEnabled(false);
if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) {
prevButton->hide();
nextButton->hide();
upButton->show();
fsButton->show();
viewModeButton->show();
}
if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
tFrame->hide();
}
m_stack->raiseWidget( IconView );
+ setUpdatesEnabled(true);
+ repaint();
}
void PMainWindow::setDocument( const QString& showImg ) {
QString file = showImg;
DocLnk lnk(showImg);
if (lnk.isValid() )