diff --git a/app/browsemainpage.cpp b/app/browsemainpage.cpp --- a/app/browsemainpage.cpp +++ b/app/browsemainpage.cpp @@ -76,7 +76,6 @@ KSelectAction* mSortAction; QActionGroup* mThumbnailDetailsActionGroup; PreviewItemDelegate* mDelegate; - bool mFullScreenMode; void setupWidgets() { @@ -227,7 +226,6 @@ d->mDirModel = gvCore->sortedDirModel(); d->mDocumentCount = 0; d->mActionCollection = actionCollection; - d->mFullScreenMode = false; d->setupWidgets(); d->setupActions(actionCollection); d->setupFilterController(); @@ -278,7 +276,7 @@ bool BrowseMainPage::eventFilter(QObject* watched, QEvent* event) { - if (d->mFullScreenMode && event->type() == QEvent::ShortcutOverride) { + if (window()->isFullScreen() && event->type() == QEvent::ShortcutOverride) { const QKeyEvent* keyEvent = static_cast(event); if (keyEvent->key() == Qt::Key_Escape) { d->mActionCollection->action("leave_fullscreen")->trigger(); @@ -370,7 +368,6 @@ void BrowseMainPage::setFullScreenMode(bool fullScreen) { - d->mFullScreenMode = fullScreen; setPalette(d->mGvCore->palette(fullScreen ? GvCore::FullScreenPalette : GvCore::NormalPalette)); d->mThumbnailView->setPalette(d->mGvCore->palette(fullScreen ? GvCore::FullScreenViewPalette : GvCore::NormalViewPalette)); d->updateUrlNavigatorBackgroundColor(); diff --git a/app/fullscreencontent.h b/app/fullscreencontent.h --- a/app/fullscreencontent.h +++ b/app/fullscreencontent.h @@ -111,7 +111,6 @@ QPointer mConfigWidget; QAction * mOptionsAction; - bool mFullScreenMode; bool mViewPageVisible; void createOptionsAction(); diff --git a/app/fullscreencontent.cpp b/app/fullscreencontent.cpp --- a/app/fullscreencontent.cpp +++ b/app/fullscreencontent.cpp @@ -102,7 +102,6 @@ FullScreenContent::FullScreenContent(QObject* parent) : QObject(parent) { - mFullScreenMode = false; mViewPageVisible = false; } @@ -341,7 +340,7 @@ void FullScreenContent::updateContainerAppearance() { - if (!mFullScreenMode || !mViewPageVisible) { + if (!mContent->window()->isFullScreen() || !mViewPageVisible) { mAutoHideContainer->setActivated(false); return; } @@ -353,7 +352,7 @@ void FullScreenContent::adjustSize() { - if (mFullScreenMode && mViewPageVisible) { + if (mContent->window()->isFullScreen() && mViewPageVisible) { mAutoHideContainer->adjustSize(); } } @@ -460,7 +459,7 @@ void FullScreenContent::setFullScreenMode(bool fullScreenMode) { - mFullScreenMode = fullScreenMode; + Q_UNUSED(fullScreenMode); updateContainerAppearance(); } diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp --- a/app/mainwindow.cpp +++ b/app/mainwindow.cpp @@ -695,7 +695,7 @@ name = BROWSE_MODE_SIDE_BAR_GROUP; break; case ViewMainPageId: - name = mViewMainPage->isFullScreenMode() + name = q->isFullScreen() ? FULLSCREEN_MODE_SIDE_BAR_GROUP : VIEW_MODE_SIDE_BAR_GROUP; break; @@ -1275,42 +1275,33 @@ qApp->setProperty("KDE_COLOR_SCHEME_PATH", d->mGvCore->fullScreenPaletteName()); QApplication::setPalette(d->mGvCore->palette(GvCore::FullScreenPalette)); - d->mFullScreenContent->setFullScreenMode(true); - d->mBrowseMainPage->setFullScreenMode(true); - d->mViewMainPage->setFullScreenMode(true); - d->mSaveBar->setFullScreenMode(true); d->setScreenSaverEnabled(false); - - // HACK: Only load sidebar config now, because it looks at - // ViewMainPage fullScreenMode property to determine the sidebar - // config group. - d->loadSideBarConfig(); } else { setAutoSaveSettings(); // Back to normal qApp->setProperty("KDE_COLOR_SCHEME_PATH", QVariant()); QApplication::setPalette(d->mGvCore->palette(GvCore::NormalPalette)); - d->mFullScreenContent->setFullScreenMode(false); - d->mBrowseMainPage->setFullScreenMode(false); - d->mViewMainPage->setFullScreenMode(false); d->mSlideShow->stop(); - d->mSaveBar->setFullScreenMode(false); KToggleFullScreenAction::setFullScreen(this, false); menuBar()->setVisible(d->mShowMenuBarAction->isChecked()); toggleStatusBar(); toolBar()->setVisible(d->mStateBeforeFullScreen.mToolBarVisible); d->setScreenSaverEnabled(true); - // Keep this after mViewMainPage->setFullScreenMode(false). - // See call to loadSideBarConfig() above. - d->loadSideBarConfig(); - // See resizeEvent d->mFullScreenLeftAt = QDateTime::currentDateTime(); } + + d->mFullScreenContent->setFullScreenMode(checked); + d->mBrowseMainPage->setFullScreenMode(checked); + d->mViewMainPage->setFullScreenMode(checked); + d->mSaveBar->setFullScreenMode(checked); + + d->loadSideBarConfig(); + setUpdatesEnabled(true); d->autoAssignThumbnailProvider(); } diff --git a/app/savebar.cpp b/app/savebar.cpp --- a/app/savebar.cpp +++ b/app/savebar.cpp @@ -69,7 +69,6 @@ QLabel* mActionsLabel; QFrame* mTooManyChangesFrame; QUrl mCurrentUrl; - bool mFullScreenMode; void createTooManyChangesFrame() { @@ -215,7 +214,7 @@ void updateWidgetSizes() { QVBoxLayout* layout = static_cast(mSaveBarWidget->layout()); - int topRowHeight = mFullScreenMode ? 0 : mTopRowWidget->height(); + int topRowHeight = q->window()->isFullScreen() ? 0 : mTopRowWidget->height(); int bottomRowHeight = mTooManyChangesFrame->isVisibleTo(mSaveBarWidget) ? mTooManyChangesFrame->sizeHint().height() : 0; int height = 2 * layout->margin() + topRowHeight + bottomRowHeight; @@ -231,7 +230,6 @@ , d(new SaveBarPrivate) { d->q = this; - d->mFullScreenMode = false; d->mActionCollection = actionCollection; d->mSaveBarWidget = new QWidget(); d->mSaveBarWidget->setObjectName(QLatin1String("saveBarWidget")); @@ -310,11 +308,10 @@ d->updateWidgetSizes(); } -void SaveBar::setFullScreenMode(bool value) +void SaveBar::setFullScreenMode(bool isFullScreen) { - d->mFullScreenMode = value; - d->mSaveAllFullScreenButton->setVisible(value); - if (value) { + d->mSaveAllFullScreenButton->setVisible(isFullScreen); + if (isFullScreen) { d->applyFullScreenStyleSheet(); } else { d->applyNormalStyleSheet(); @@ -326,7 +323,7 @@ { QList lst = DocumentFactory::instance()->modifiedDocumentList(); - if (d->mFullScreenMode) { + if (window()->isFullScreen()) { d->mTopRowWidget->hide(); } else { d->mTopRowWidget->show(); @@ -336,7 +333,7 @@ d->updateTooManyChangesFrame(lst); d->updateWidgetSizes(); - if (lst.isEmpty() || (d->mFullScreenMode && !d->mTooManyChangesFrame->isVisibleTo(d->mSaveBarWidget))) { + if (lst.isEmpty() || (window()->isFullScreen() && !d->mTooManyChangesFrame->isVisibleTo(d->mSaveBarWidget))) { slideOut(); } else { slideIn(); diff --git a/app/viewmainpage.h b/app/viewmainpage.h --- a/app/viewmainpage.h +++ b/app/viewmainpage.h @@ -70,8 +70,6 @@ void setFullScreenMode(bool fullScreen); - bool isFullScreenMode() const; - int statusBarHeight() const; QSize sizeHint() const Q_DECL_OVERRIDE; diff --git a/app/viewmainpage.cpp b/app/viewmainpage.cpp --- a/app/viewmainpage.cpp +++ b/app/viewmainpage.cpp @@ -160,7 +160,6 @@ // that use this KPart QHash mActivityResources; - bool mFullScreenMode; bool mCompareMode; bool mThumbnailBarVisibleBeforeFullScreen; ZoomMode::Enum mZoomMode; @@ -400,7 +399,6 @@ d->mSlideShow = slideShow; d->mActionCollection = actionCollection; d->mGvCore = gvCore; - d->mFullScreenMode = false; d->mCompareMode = false; d->mThumbnailBarVisibleBeforeFullScreen = false; @@ -507,7 +505,6 @@ void ViewMainPage::setFullScreenMode(bool fullScreenMode) { - d->mFullScreenMode = fullScreenMode; d->mStatusBarContainer->setVisible(!fullScreenMode); if (fullScreenMode) { @@ -524,11 +521,6 @@ d->mToggleThumbnailBarAction->setEnabled(!fullScreenMode); } -bool ViewMainPage::isFullScreenMode() const -{ - return d->mFullScreenMode; -} - ThumbnailBarView* ViewMainPage::thumbnailBar() const { return d->mThumbnailBar;