summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp2
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp27
2 files changed, 8 insertions, 21 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index 03df321..6c3f9cb 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -275,9 +275,9 @@ void ImageView::enableFullscreen()
setUpdatesEnabled(false);
// This is needed because showNormal() forcefully changes the window
// style to WSTyle_TopLevel.
- reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));
+ reparent(0, WStyle_Customize | WStyle_NoBorderEx, QPoint(0,0));
// Enable fullscreen.
/* this is the trick - I don't now why, but after a showFullScreen QTE toggles the focus
* so we must block it here! */
m_ignore_next_in = true;
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 3a89dfd..d11e4e1 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -306,9 +306,9 @@ void PMainWindow::setupViewWindow(bool current, bool forceDisplay)
return;
}
if (current) {
m_disp->setBackgroundColor(black);
- m_disp->reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));
+ m_disp->reparent(0, WStyle_Customize | WStyle_NoBorderEx, QPoint(0,0));
m_disp->setVScrollBarMode(QScrollView::AlwaysOff);
m_disp->setHScrollBarMode(QScrollView::AlwaysOff);
m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height());
m_disp->setFullScreen(current,forceDisplay);
@@ -374,31 +374,15 @@ void PMainWindow::slotShowInfo( const QString& inf ) {
}
void PMainWindow::slotDisplay( const QString& inf ) {
bool nwindow = false;
- bool disp_hack = false;
- int lb;
- if (m_disp && m_disp->fullScreen()) {
- lb = m_disp->Intensity();
- delete m_disp;
- m_disp = 0;
-
- disp_hack = true;
- }
if ( !m_disp ) {
nwindow = true;
initDisp();
- m_disp->setIntensity((disp_hack?lb:m_Intensity));
+ m_disp->setIntensity(m_Intensity);
+ m_setCurrentBrightness->setEnabled(true);
}
- m_setCurrentBrightness->setEnabled(true);
-
- Opie::Ui::OWait wdlg;
- wdlg.setTimerLength(30);
- wdlg.show();
- //qApp->processEvents(20);
m_disp->setImage( inf );
- wdlg.hide();
- //qApp->processEvents(20);
if (m_SmallWindow) {
if (m_gPrevNext->isEnabled()==false) {
m_gPrevNext->addTo(toolBar);
fsButton->hide();
@@ -413,9 +397,12 @@ void PMainWindow::slotDisplay( const QString& inf ) {
if (!nwindow && m_disp->fullScreen()!=m_aFullScreen->isOn()) {
slotFullScreenToggled(m_aFullScreen->isOn());
}
if (m_disp->fullScreen()) {
- qwsDisplay()->requestFocus( m_disp->winId(), TRUE);
+ if (!m_disp->isVisible()) {
+ m_disp->showFullScreen();
+ qwsDisplay()->requestFocus( m_disp->winId(), TRUE);
+ }
} else {
m_stack->raiseWidget( ImageDisplay );
}
}