diff --git a/src/board/UBDrawingController.h b/src/board/UBDrawingController.h index 06a1a2c1..e40c156f 100644 --- a/src/board/UBDrawingController.h +++ b/src/board/UBDrawingController.h @@ -66,7 +66,7 @@ class UBDrawingController : public QObject UBAbstractDrawRuler* mActiveRuler; - void setInDestopMode(bool mode){ + void setInDesktopMode(bool mode){ mIsDesktopMode = mode; } diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp index 04f504af..582bf1c3 100644 --- a/src/core/UBApplicationController.cpp +++ b/src/core/UBApplicationController.cpp @@ -371,6 +371,7 @@ void UBApplicationController::showBoard() mIsShowingDesktop = false; UBPlatformUtils::setDesktopMode(false); + UBDrawingController::drawingController()->setInDesktopMode(false); mUninoteController->hideWindow(); @@ -473,7 +474,7 @@ void UBApplicationController::showDesktop(bool dontSwitchFrontProcess) UBPlatformUtils::bringPreviousProcessToFront(); } - UBDrawingController::drawingController()->setInDestopMode(true); + UBDrawingController::drawingController()->setInDesktopMode(true); UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector); } diff --git a/src/frameworks/UBPlatformUtils_mac.mm b/src/frameworks/UBPlatformUtils_mac.mm index 37d5b1b3..f39fccad 100644 --- a/src/frameworks/UBPlatformUtils_mac.mm +++ b/src/frameworks/UBPlatformUtils_mac.mm @@ -90,10 +90,10 @@ void UBPlatformUtils::setDesktopMode(bool desktop) @try { // temporarily disabled due to bug: when switching to desktop mode (and calling this), // openboard switches right back to the board mode. clicking again on desktop mode works. - /*if (desktop) { + if (desktop) { [NSApp setPresentationOptions:NSApplicationPresentationAutoHideMenuBar | NSApplicationPresentationAutoHideDock]; } - else*/ + else [NSApp setPresentationOptions:NSApplicationPresentationHideMenuBar | NSApplicationPresentationHideDock]; }