author | alwin <alwin> | 2004-04-21 09:56:14 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-04-21 09:56:14 (UTC) |
commit | f4ab243362a9b93f17e92bbf3189324f66c8f686 (patch) (unidiff) | |
tree | 85fc40502c8a6fb76efb3ad2f2cf3f80c5af2cf6 | |
parent | c61b410ba0051c266501933f7f675291684613f8 (diff) | |
download | opie-f4ab243362a9b93f17e92bbf3189324f66c8f686.zip opie-f4ab243362a9b93f17e92bbf3189324f66c8f686.tar.gz opie-f4ab243362a9b93f17e92bbf3189324f66c8f686.tar.bz2 |
polish on fullscreen mode
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.cpp | 51 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.h | 2 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 7 |
3 files changed, 48 insertions, 12 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 | |||
@@ -107,5 +107,3 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e) | |||
107 | } | 107 | } |
108 | if (!fullScreen()) return; | 108 | // if (!fullScreen()) return; |
109 | #if 0 | ||
110 | // doesn't work right (repainting problems) | ||
111 | odebug << "Popup " << oendl; | 109 | odebug << "Popup " << oendl; |
@@ -113,9 +111,13 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e) | |||
113 | if (!m) return; | 111 | if (!m) return; |
114 | m->insertItem(tr("Previous image"),ShowPrevious); | 112 | bool old = fullScreen(); |
115 | m->insertItem(tr("Next image"),ShowNext); | 113 | m->insertItem(tr("Toggle fullscreen"),this, SIGNAL(toggleFullScreen())); |
114 | if (fullScreen()) { | ||
115 | m->insertSeparator(); | ||
116 | m->insertItem(tr("Previous image"),this,SIGNAL(dispPrev())); | ||
117 | m->insertItem(tr("Next image"),this,SIGNAL(dispNext())); | ||
116 | m->insertSeparator(); | 118 | m->insertSeparator(); |
117 | m->insertItem(tr("Toggle fullscreen"),FullScreen); | 119 | m->insertItem(tr("Toggle autoscale"),this, SIGNAL(toggleAutoscale())); |
118 | m->insertItem(tr("Toggle autoscale"),Autoscale); | 120 | m->insertItem(tr("Toggle autorotate"),this, SIGNAL(toggleAutorotate())); |
119 | m->insertItem(tr("Toggle autorotate"),Autorotate); | 121 | m->insertItem(tr("Toggle thumbnail"),this, SIGNAL(toggleZoomer())); |
120 | m->insertItem(tr("Toggle thumbnail"),Zoomer); | 122 | } |
121 | m->setFocus(); | 123 | m->setFocus(); |
@@ -123,4 +125,8 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e) | |||
123 | delete m; | 125 | delete m; |
124 | parentWidget()->showFullScreen(); | 126 | /* if we were fullScreen() and must overlap the taskbar again */ |
125 | #endif | 127 | if (fullScreen() && old) { |
128 | enableFullscreen(); | ||
129 | // parentWidget()->hide(); | ||
130 | // parentWidget()->show(); | ||
131 | } | ||
126 | } | 132 | } |
@@ -131 +137,24 @@ void ImageView::setFullScreen(bool how) | |||
131 | } | 137 | } |
138 | |||
139 | void ImageView::focusInEvent(QFocusEvent *) | ||
140 | { | ||
141 | // Always do it here, no matter the size. | ||
142 | /* result in an endless loop */ | ||
143 | // if (fullScreen()) enableFullscreen(); | ||
144 | } | ||
145 | |||
146 | void ImageView::enableFullscreen() | ||
147 | { | ||
148 | if (!fullScreen()) return; | ||
149 | // Make sure size is correct | ||
150 | parentWidget()->setFixedSize(qApp->desktop()->size()); | ||
151 | // This call is needed because showFullScreen won't work | ||
152 | // correctly if the widget already considers itself to be fullscreen. | ||
153 | parentWidget()->showNormal(); | ||
154 | // This is needed because showNormal() forcefully changes the window | ||
155 | // style to WSTyle_TopLevel. | ||
156 | parentWidget()->reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0)); | ||
157 | // Enable fullscreen. | ||
158 | parentWidget()->showFullScreen(); | ||
159 | } | ||
160 | |||
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 | |||
@@ -48,2 +48,3 @@ protected: | |||
48 | bool m_isFullScreen:1; | 48 | bool m_isFullScreen:1; |
49 | void enableFullscreen(); | ||
49 | 50 | ||
@@ -53,2 +54,3 @@ protected slots: | |||
53 | virtual void contentsMousePressEvent ( QMouseEvent * e); | 54 | virtual void contentsMousePressEvent ( QMouseEvent * e); |
55 | virtual void focusInEvent ( QFocusEvent * ); | ||
54 | }; | 56 | }; |
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 | |||
@@ -331,3 +331,3 @@ void PMainWindow::slotToggleFullScreen() | |||
331 | if (!tFrame) { | 331 | if (!tFrame) { |
332 | tFrame = new QWidget(0,0,WType_TopLevel|WStyle_NoBorder|WStyle_StaysOnTop); | 332 | tFrame = new QWidget(0,0,WStyle_Customize|WStyle_NoBorder); |
333 | tFrame->resize(qApp->desktop()->width(), qApp->desktop()->height()); | 333 | tFrame->resize(qApp->desktop()->width(), qApp->desktop()->height()); |
@@ -341,2 +341,3 @@ void PMainWindow::slotToggleFullScreen() | |||
341 | } else { | 341 | } else { |
342 | setUpdatesEnabled(false); | ||
342 | odebug << "window" << oendl; | 343 | odebug << "window" << oendl; |
@@ -354,2 +355,3 @@ void PMainWindow::slotToggleFullScreen() | |||
354 | } | 355 | } |
356 | setUpdatesEnabled(true); | ||
355 | } | 357 | } |
@@ -429,2 +431,3 @@ void PMainWindow::closeEvent( QCloseEvent* ev ) { | |||
429 | void PMainWindow::raiseIconView() { | 431 | void PMainWindow::raiseIconView() { |
432 | setUpdatesEnabled(false); | ||
430 | if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { | 433 | if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { |
@@ -440,2 +443,4 @@ void PMainWindow::raiseIconView() { | |||
440 | m_stack->raiseWidget( IconView ); | 443 | m_stack->raiseWidget( IconView ); |
444 | setUpdatesEnabled(true); | ||
445 | repaint(); | ||
441 | } | 446 | } |