Your ROOT_URL in app.ini is http://git.osmesh.ru/ but you are visiting http://91.221.70.94:3000/MOS/OpenBoard/commit/8ccf7480c481b1c40d9affc2ee3dfa920cbcb5aa?style=split&whitespace=ignore-all
You should set ROOT_URL correctly, otherwise the web may not work correctly.
3 changed files with
27 additions and
7 deletions
src/desktop/UBDesktopAnnotationController.cpp
src/frameworks/UBPlatformUtils.h
src/frameworks/UBPlatformUtils_mac.mm
@ -374,15 +374,22 @@ void UBDesktopAnnotationController::close()
void UBDesktopAnnotationController : : stylusToolChanged ( int tool )
void UBDesktopAnnotationController : : stylusToolChanged ( int tool )
{
{
Q_UNUSED ( tool ) ;
Q_UNUSED ( tool ) ;
// UBStylusTool::Enum eTool = (UBStylusTool::Enum)tool;
// if(eTool != UBStylusTool::Selector && eTool != UBStylusTool::Text)
if ( UBDrawingController : : drawingController ( ) - > isInDesktopMode ( ) )
// {
{
// if(mKeyboardPalette->m_isVisible)
UBStylusTool : : Enum eTool = ( UBStylusTool : : Enum ) tool ;
// UBApplication::mainWindow->actionVirtualKeyboard->activate(QAction::Trigger);
if ( eTool = = UBStylusTool : : Selector )
// }
{
UBPlatformUtils : : toggleFinder ( true ) ;
}
else
{
UBPlatformUtils : : toggleFinder ( false ) ;
}
updateBackground ( ) ;
updateBackground ( ) ;
}
}
}
void UBDesktopAnnotationController : : updateBackground ( )
void UBDesktopAnnotationController : : updateBackground ( )
@ -212,6 +212,7 @@ public:
# ifdef Q_OS_OSX
# ifdef Q_OS_OSX
static void SetMacLocaleByIdentifier ( const QString & id ) ;
static void SetMacLocaleByIdentifier ( const QString & id ) ;
static void toggleFinder ( const bool on ) ;
# endif
# endif
} ;
} ;
@ -524,6 +524,18 @@ QString UBPlatformUtils::urlFromClipboard()
return qsRet;
return qsRet;
}
}
void UBPlatformUtils::toggleFinder(const bool on)
{
if (on)
{
[NSApp setPresentationOptions:NSApplicationPresentationDefault];
}
else
{
[NSApp setPresentationOptions:NSApplicationPresentationHideMenuBar | NSApplicationPresentationHideDock];
}
}
void UBPlatformUtils::SetMacLocaleByIdentifier(const QString& id)
void UBPlatformUtils::SetMacLocaleByIdentifier(const QString& id)
{
{