From 723cb4f3f8c193d3a49ceee9999cf89c485cf46f Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 18 Dec 2016 10:50:23 +0100 Subject: [PATCH] fixes #0002801: F11 enters fullscreen, but does not exit (should behave as toggle) --- src/Gui/CommandView.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index 8b2adf43e..8b9238e55 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -1460,17 +1460,21 @@ void StdViewDockUndockFullscreen::activated(int iMsg) { MDIView* view = getMainWindow()->activeWindow(); if (!view) return; // no active view - if (iMsg == (int)(view->currentViewMode())) - return; // nothing to do if (iMsg==0) { - view->setCurrentViewMode( MDIView::Child ); + view->setCurrentViewMode(MDIView::Child); } else if (iMsg==1) { - view->setCurrentViewMode( MDIView::TopLevel ); + if (view->currentViewMode() == MDIView::TopLevel) + view->setCurrentViewMode(MDIView::Child); + else + view->setCurrentViewMode(MDIView::TopLevel); } else if (iMsg==2) { - view->setCurrentViewMode( MDIView::FullScreen ); + if (view->currentViewMode() == MDIView::FullScreen) + view->setCurrentViewMode(MDIView::Child); + else + view->setCurrentViewMode(MDIView::FullScreen); } }