removed some code previsously added/uncommented to workaround an issue with desktop mode

preferencesAboutTextFull
Clément Fauconnier 4 years ago
parent 3923b33531
commit e2d1594629
  1. 3
      src/desktop/UBDesktopAnnotationController.cpp
  2. 4
      src/frameworks/UBPlatformUtils_mac.mm

@ -366,6 +366,7 @@ void UBDesktopAnnotationController::stylusToolChanged(int tool)
{ {
Q_UNUSED(tool); Q_UNUSED(tool);
#ifdef Q_OS_OSX #ifdef Q_OS_OSX
/* no longer needed
if (UBDrawingController::drawingController()->isInDesktopMode()) if (UBDrawingController::drawingController()->isInDesktopMode())
{ {
UBStylusTool::Enum eTool = (UBStylusTool::Enum)tool; UBStylusTool::Enum eTool = (UBStylusTool::Enum)tool;
@ -377,7 +378,7 @@ void UBDesktopAnnotationController::stylusToolChanged(int tool)
{ {
UBPlatformUtils::toggleFinder(false); UBPlatformUtils::toggleFinder(false);
} }
} }*/
#endif #endif
updateBackground(); updateBackground();

@ -91,10 +91,10 @@ void UBPlatformUtils::setDesktopMode(bool desktop)
#if defined(Q_OS_OSX) && (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) #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), // 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. // openboard switches right back to the board mode. clicking again on desktop mode works.
if (desktop) { /*if (desktop) {
[NSApp setPresentationOptions:NSApplicationPresentationAutoHideMenuBar | NSApplicationPresentationAutoHideDock]; [NSApp setPresentationOptions:NSApplicationPresentationAutoHideMenuBar | NSApplicationPresentationAutoHideDock];
} }
else else*/
[NSApp setPresentationOptions:NSApplicationPresentationHideMenuBar | NSApplicationPresentationHideDock]; [NSApp setPresentationOptions:NSApplicationPresentationHideMenuBar | NSApplicationPresentationHideDock];
#else // QT_VERSION_CHECK(5, 10, 0) #else // QT_VERSION_CHECK(5, 10, 0)
[NSApp setPresentationOptions:NSApplicationPresentationHideMenuBar | NSApplicationPresentationHideDock]; [NSApp setPresentationOptions:NSApplicationPresentationHideMenuBar | NSApplicationPresentationHideDock];

Loading…
Cancel
Save