author | alwin <alwin> | 2004-04-22 13:15:08 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-04-22 13:15:08 (UTC) |
commit | 162c71d6528515ea4b28520e9708c8ce9ca7fba2 (patch) (unidiff) | |
tree | ea538ee02a3edec808aacb1b4813221fd4939ac7 /noncore/graphics/opie-eye | |
parent | b9509b7b90d7c70c5407f6774512037ff77fcec4 (diff) | |
download | opie-162c71d6528515ea4b28520e9708c8ce9ca7fba2.zip opie-162c71d6528515ea4b28520e9708c8ce9ca7fba2.tar.gz opie-162c71d6528515ea4b28520e9708c8ce9ca7fba2.tar.bz2 |
resolved some problems with fullscreen mode.
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.cpp | 41 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.h | 26 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 6 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.h | 3 |
4 files changed, 62 insertions, 14 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp index 53376c0..5b00dea 100644 --- a/noncore/graphics/opie-eye/gui/imageview.cpp +++ b/noncore/graphics/opie-eye/gui/imageview.cpp | |||
@@ -14,6 +14,8 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name | |||
14 | : Opie::MM::OImageScrollView(parent,name,fl) | 14 | : Opie::MM::OImageScrollView(parent,name,fl) |
15 | { | 15 | { |
16 | m_viewManager = 0; | 16 | m_viewManager = 0; |
17 | m_focus_out = false; | ||
18 | block_next_focus = true; | ||
17 | m_cfg = cfg; | 19 | m_cfg = cfg; |
18 | m_isFullScreen = false; | 20 | m_isFullScreen = false; |
19 | QPEApplication::setStylusOperation(viewport(),QPEApplication::RightOnHold); | 21 | QPEApplication::setStylusOperation(viewport(),QPEApplication::RightOnHold); |
@@ -126,8 +128,6 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e) | |||
126 | /* if we were fullScreen() and must overlap the taskbar again */ | 128 | /* if we were fullScreen() and must overlap the taskbar again */ |
127 | if (fullScreen() && old) { | 129 | if (fullScreen() && old) { |
128 | enableFullscreen(); | 130 | enableFullscreen(); |
129 | // parentWidget()->hide(); | ||
130 | // parentWidget()->show(); | ||
131 | } | 131 | } |
132 | } | 132 | } |
133 | 133 | ||
@@ -136,25 +136,50 @@ void ImageView::setFullScreen(bool how) | |||
136 | m_isFullScreen = how; | 136 | m_isFullScreen = how; |
137 | } | 137 | } |
138 | 138 | ||
139 | void ImageView::focusInEvent(QFocusEvent *) | 139 | void ImageView::focusInEvent(QFocusEvent *) |
140 | { | 140 | { |
141 | // Always do it here, no matter the size. | 141 | // Always do it here, no matter the size. |
142 | /* result in an endless loop */ | 142 | odebug << "Focus in" << oendl; |
143 | // if (fullScreen()) enableFullscreen(); | 143 | } |
144 | |||
145 | void ImageView::focusOutEvent(QFocusEvent *) | ||
146 | { | ||
147 | odebug << "Focus out" << oendl; | ||
144 | } | 148 | } |
145 | 149 | ||
146 | void ImageView::enableFullscreen() | 150 | void ImageView::enableFullscreen() |
147 | { | 151 | { |
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 | // This call is needed because showFullScreen won't work |
152 | // correctly if the widget already considers itself to be fullscreen. | 153 | // correctly if the widget already considers itself to be fullscreen. |
154 | setUpdatesEnabled(false); | ||
155 | odebug << "showNormal();" << oendl; | ||
153 | parentWidget()->showNormal(); | 156 | parentWidget()->showNormal(); |
157 | odebug << "showNormal(); done " << oendl; | ||
154 | // This is needed because showNormal() forcefully changes the window | 158 | // This is needed because showNormal() forcefully changes the window |
155 | // style to WSTyle_TopLevel. | 159 | // style to WSTyle_TopLevel. |
160 | odebug << " reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));" << oendl; | ||
156 | parentWidget()->reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0)); | 161 | parentWidget()->reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0)); |
162 | odebug << " reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0)); done" << oendl; | ||
157 | // Enable fullscreen. | 163 | // Enable fullscreen. |
164 | odebug << "showFullScreen();" << oendl; | ||
158 | parentWidget()->showFullScreen(); | 165 | parentWidget()->showFullScreen(); |
166 | odebug << "showFullScreen(); done" << oendl; | ||
167 | setUpdatesEnabled(true); | ||
168 | } | ||
169 | |||
170 | void ImageWidget::show() | ||
171 | { | ||
172 | QWidget::show(); | ||
159 | } | 173 | } |
160 | 174 | ||
175 | void ImageWidget::hide() | ||
176 | { | ||
177 | QWidget::hide(); | ||
178 | } | ||
179 | |||
180 | ImageWidget::ImageWidget(QWidget * parent, const char * name, WFlags f) | ||
181 | : QWidget(parent,name,f) | ||
182 | { | ||
183 | // Make sure size is correct | ||
184 | setFixedSize(qApp->desktop()->size()); | ||
185 | } | ||
diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h index 4d2405f..5f15bc9 100644 --- a/noncore/graphics/opie-eye/gui/imageview.h +++ b/noncore/graphics/opie-eye/gui/imageview.h | |||
@@ -3,6 +3,8 @@ | |||
3 | 3 | ||
4 | #include <opie2/oimagescrollview.h> | 4 | #include <opie2/oimagescrollview.h> |
5 | 5 | ||
6 | #include <qwidget.h> | ||
7 | |||
6 | namespace Opie { | 8 | namespace Opie { |
7 | namespace Core { | 9 | namespace Core { |
8 | class OConfig; | 10 | class OConfig; |
@@ -29,6 +31,7 @@ public: | |||
29 | virtual ~ImageView(); | 31 | virtual ~ImageView(); |
30 | Opie::Core::OKeyConfigManager* manager(); | 32 | Opie::Core::OKeyConfigManager* manager(); |
31 | void setFullScreen(bool how); | 33 | void setFullScreen(bool how); |
34 | virtual void enableFullscreen(); | ||
32 | bool fullScreen(){return m_isFullScreen;} | 35 | bool fullScreen(){return m_isFullScreen;} |
33 | 36 | ||
34 | signals: | 37 | signals: |
@@ -46,13 +49,32 @@ protected: | |||
46 | Opie::Core::OKeyConfigManager*m_viewManager; | 49 | Opie::Core::OKeyConfigManager*m_viewManager; |
47 | void initKeys(); | 50 | void initKeys(); |
48 | bool m_isFullScreen:1; | 51 | bool m_isFullScreen:1; |
49 | void enableFullscreen(); | 52 | bool m_focus_out:1; |
53 | bool block_next_focus:1; | ||
54 | |||
55 | virtual void focusInEvent ( QFocusEvent * ); | ||
56 | virtual void focusOutEvent ( QFocusEvent * ); | ||
50 | 57 | ||
51 | protected slots: | 58 | protected slots: |
52 | virtual void slotShowImageInfo(); | 59 | virtual void slotShowImageInfo(); |
53 | virtual void keyReleaseEvent(QKeyEvent * e); | 60 | virtual void keyReleaseEvent(QKeyEvent * e); |
54 | virtual void contentsMousePressEvent ( QMouseEvent * e); | 61 | virtual void contentsMousePressEvent ( QMouseEvent * e); |
55 | virtual void focusInEvent ( QFocusEvent * ); | 62 | }; |
63 | |||
64 | class ImageWidget:public QWidget | ||
65 | { | ||
66 | Q_OBJECT | ||
67 | public: | ||
68 | ImageWidget(QWidget * parent=0, const char * name=0, WFlags f = WStyle_Customize | WStyle_NoBorder); | ||
69 | virtual ~ImageWidget(){}; | ||
70 | |||
71 | protected: | ||
72 | |||
73 | public slots: | ||
74 | virtual void show(); | ||
75 | virtual void hide(); | ||
76 | |||
77 | protected slots: | ||
56 | }; | 78 | }; |
57 | 79 | ||
58 | #endif | 80 | #endif |
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index ec6b051..fa1680c 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp | |||
@@ -331,7 +331,7 @@ void PMainWindow::slotToggleFullScreen() | |||
331 | odebug << "full" << oendl; | 331 | odebug << "full" << oendl; |
332 | m_disp->setBackgroundColor(black); | 332 | m_disp->setBackgroundColor(black); |
333 | if (!tFrame) { | 333 | if (!tFrame) { |
334 | tFrame = new QWidget(0,0,WStyle_Customize|WStyle_NoBorder); | 334 | tFrame = new ImageWidget(0,0,WStyle_Customize|WStyle_NoBorder); |
335 | tFrame->resize(qApp->desktop()->width(), qApp->desktop()->height()); | 335 | tFrame->resize(qApp->desktop()->width(), qApp->desktop()->height()); |
336 | tFrame->setMinimumSize(qApp->desktop()->width(), qApp->desktop()->height()); | 336 | tFrame->setMinimumSize(qApp->desktop()->width(), qApp->desktop()->height()); |
337 | } | 337 | } |
@@ -398,8 +398,8 @@ void PMainWindow::slotDisplay( const QString& inf ) { | |||
398 | viewModeButton->hide(); | 398 | viewModeButton->hide(); |
399 | } | 399 | } |
400 | if (m_disp->fullScreen()) { | 400 | if (m_disp->fullScreen()) { |
401 | tFrame->setActiveWindow(); | 401 | // tFrame->showFullScreen(); |
402 | tFrame->showFullScreen(); | 402 | m_disp->enableFullscreen(); |
403 | } else { | 403 | } else { |
404 | m_stack->raiseWidget( ImageDisplay ); | 404 | m_stack->raiseWidget( ImageDisplay ); |
405 | } | 405 | } |
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h index 1f90f9f..9e94c60 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.h +++ b/noncore/graphics/opie-eye/gui/mainwindow.h | |||
@@ -22,6 +22,7 @@ namespace Core{ | |||
22 | } | 22 | } |
23 | 23 | ||
24 | class ImageView; | 24 | class ImageView; |
25 | class ImageWidget; | ||
25 | class PIconView; | 26 | class PIconView; |
26 | class imageinfo; | 27 | class imageinfo; |
27 | 28 | ||
@@ -67,7 +68,7 @@ private: | |||
67 | bool autoRotate; | 68 | bool autoRotate; |
68 | bool autoScale; | 69 | bool autoScale; |
69 | bool zoomerOn; | 70 | bool zoomerOn; |
70 | QWidget*tFrame; | 71 | ImageWidget*tFrame; |
71 | QToolButton*rotateButton,*upButton,*fsButton,*viewModeButton; | 72 | QToolButton*rotateButton,*upButton,*fsButton,*viewModeButton; |
72 | QToolButton*nextButton,*prevButton,*zoomButton,*scaleButton; | 73 | QToolButton*nextButton,*prevButton,*zoomButton,*scaleButton; |
73 | 74 | ||