diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp index 6588f645..564ca812 100644 --- a/src/desktop/UBDesktopAnnotationController.cpp +++ b/src/desktop/UBDesktopAnnotationController.cpp @@ -366,6 +366,7 @@ void UBDesktopAnnotationController::stylusToolChanged(int tool) { Q_UNUSED(tool); #ifdef Q_OS_OSX + /* no longer needed if (UBDrawingController::drawingController()->isInDesktopMode()) { UBStylusTool::Enum eTool = (UBStylusTool::Enum)tool; @@ -377,7 +378,7 @@ void UBDesktopAnnotationController::stylusToolChanged(int tool) { UBPlatformUtils::toggleFinder(false); } - } + }*/ #endif updateBackground(); diff --git a/src/frameworks/UBPlatformUtils_mac.mm b/src/frameworks/UBPlatformUtils_mac.mm index 9129f724..ae5c5956 100644 --- a/src/frameworks/UBPlatformUtils_mac.mm +++ b/src/frameworks/UBPlatformUtils_mac.mm @@ -91,10 +91,10 @@ void UBPlatformUtils::setDesktopMode(bool desktop) #if defined(Q_OS_OSX) && (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) // 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]; #else // QT_VERSION_CHECK(5, 10, 0) [NSApp setPresentationOptions:NSApplicationPresentationHideMenuBar | NSApplicationPresentationHideDock];