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/gui/imageview.cpp | |
parent | b9509b7b90d7c70c5407f6774512037ff77fcec4 (diff) | |
download | opie-162c71d6528515ea4b28520e9708c8ce9ca7fba2.zip opie-162c71d6528515ea4b28520e9708c8ce9ca7fba2.tar.gz opie-162c71d6528515ea4b28520e9708c8ce9ca7fba2.tar.bz2 |
resolved some problems with fullscreen mode.
Diffstat (limited to 'noncore/graphics/opie-eye/gui/imageview.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.cpp | 39 |
1 files changed, 32 insertions, 7 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 | |||
@@ -16,2 +16,4 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name | |||
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; |
@@ -128,4 +130,2 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e) | |||
128 | enableFullscreen(); | 130 | enableFullscreen(); |
129 | // parentWidget()->hide(); | ||
130 | // parentWidget()->show(); | ||
131 | } | 131 | } |
@@ -141,4 +141,8 @@ void ImageView::focusInEvent(QFocusEvent *) | |||
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 | } |
@@ -147,14 +151,35 @@ 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 | } | ||