Diffstat (limited to 'noncore/graphics/opie-eye/gui/imageview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.cpp | 41 |
1 files changed, 33 insertions, 8 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 @@ -13,8 +13,10 @@ using namespace Opie::Core; ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name, WFlags fl ) : Opie::MM::OImageScrollView(parent,name,fl) { m_viewManager = 0; + m_focus_out = false; + block_next_focus = true; m_cfg = cfg; m_isFullScreen = false; QPEApplication::setStylusOperation(viewport(),QPEApplication::RightOnHold); initKeys(); @@ -125,36 +127,59 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e) delete m; /* if we were fullScreen() and must overlap the taskbar again */ if (fullScreen() && old) { enableFullscreen(); -// parentWidget()->hide(); -// parentWidget()->show(); } } void ImageView::setFullScreen(bool how) { m_isFullScreen = how; } -void ImageView::focusInEvent(QFocusEvent *) +void ImageView::focusInEvent(QFocusEvent *) { // Always do it here, no matter the size. - /* result in an endless loop */ -// if (fullScreen()) enableFullscreen(); + odebug << "Focus in" << oendl; +} + +void ImageView::focusOutEvent(QFocusEvent *) +{ + odebug << "Focus out" << oendl; } void ImageView::enableFullscreen() { - if (!fullScreen()) return; - // Make sure size is correct - parentWidget()->setFixedSize(qApp->desktop()->size()); // This call is needed because showFullScreen won't work // correctly if the widget already considers itself to be fullscreen. + setUpdatesEnabled(false); + odebug << "showNormal();" << oendl; parentWidget()->showNormal(); + odebug << "showNormal(); done " << oendl; // This is needed because showNormal() forcefully changes the window // style to WSTyle_TopLevel. + odebug << " reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));" << oendl; parentWidget()->reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0)); + odebug << " reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0)); done" << oendl; // Enable fullscreen. + odebug << "showFullScreen();" << oendl; parentWidget()->showFullScreen(); + odebug << "showFullScreen(); done" << oendl; + setUpdatesEnabled(true); +} + +void ImageWidget::show() +{ + QWidget::show(); } +void ImageWidget::hide() +{ + QWidget::hide(); +} + +ImageWidget::ImageWidget(QWidget * parent, const char * name, WFlags f) + : QWidget(parent,name,f) +{ + // Make sure size is correct + setFixedSize(qApp->desktop()->size()); +} |