summaryrefslogtreecommitdiff
authoralwin <alwin>2004-04-22 13:15:08 (UTC)
committer alwin <alwin>2004-04-22 13:15:08 (UTC)
commit162c71d6528515ea4b28520e9708c8ce9ca7fba2 (patch) (unidiff)
treeea538ee02a3edec808aacb1b4813221fd4939ac7
parentb9509b7b90d7c70c5407f6774512037ff77fcec4 (diff)
downloadopie-162c71d6528515ea4b28520e9708c8ce9ca7fba2.zip
opie-162c71d6528515ea4b28520e9708c8ce9ca7fba2.tar.gz
opie-162c71d6528515ea4b28520e9708c8ce9ca7fba2.tar.bz2
resolved some problems with fullscreen mode.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp41
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.h26
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp6
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.h3
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
@@ -15,4 +15,6 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name
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;
@@ -127,6 +129,4 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e)
127 if (fullScreen() && old) { 129 if (fullScreen() && old) {
128 enableFullscreen(); 130 enableFullscreen();
129// parentWidget()->hide();
130// parentWidget()->show();
131 } 131 }
132} 132}
@@ -137,24 +137,49 @@ void ImageView::setFullScreen(bool how)
137} 137}
138 138
139void ImageView::focusInEvent(QFocusEvent *) 139void 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
145void ImageView::focusOutEvent(QFocusEvent *)
146{
147 odebug << "Focus out" << oendl;
144} 148}
145 149
146void ImageView::enableFullscreen() 150void 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
170void ImageWidget::show()
171{
172 QWidget::show();
159} 173}
160 174
175void ImageWidget::hide()
176{
177 QWidget::hide();
178}
179
180ImageWidget::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
@@ -4,4 +4,6 @@
4#include <opie2/oimagescrollview.h> 4#include <opie2/oimagescrollview.h>
5 5
6#include <qwidget.h>
7
6namespace Opie { 8namespace Opie {
7 namespace Core { 9 namespace Core {
@@ -30,4 +32,5 @@ public:
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
@@ -47,5 +50,9 @@ protected:
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
51protected slots: 58protected slots:
@@ -53,5 +60,20 @@ protected slots:
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
64class ImageWidget:public QWidget
65{
66 Q_OBJECT
67public:
68 ImageWidget(QWidget * parent=0, const char * name=0, WFlags f = WStyle_Customize | WStyle_NoBorder);
69 virtual ~ImageWidget(){};
70
71protected:
72
73public slots:
74 virtual void show();
75 virtual void hide();
76
77protected slots:
56}; 78};
57 79
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
@@ -332,5 +332,5 @@ void PMainWindow::slotToggleFullScreen()
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());
@@ -399,6 +399,6 @@ void PMainWindow::slotDisplay( const QString& inf ) {
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 );
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
@@ -23,4 +23,5 @@ namespace Core{
23 23
24class ImageView; 24class ImageView;
25class ImageWidget;
25class PIconView; 26class PIconView;
26class imageinfo; 27class imageinfo;
@@ -68,5 +69,5 @@ private:
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;