Commit da52cc61 authored by Claudio Valerio's avatar Claudio Valerio

Merge branch 'master' of github.com:Sankore/Sankore-3.1

parents 64215876 feae4a95
...@@ -43,7 +43,7 @@ body{ ...@@ -43,7 +43,7 @@ body{
border-bottom-right-radius: 15px; border-bottom-right-radius: 15px;
border: solid 4px #EEEEEE; border: solid 4px #EEEEEE;
border-top: none; border-top: none;
z-index: 10; z-index: 101;
} }
.togglePages{ .togglePages{
...@@ -61,6 +61,7 @@ body{ ...@@ -61,6 +61,7 @@ body{
-webkit-box-shadow: #dadada -1px 0 4px; -webkit-box-shadow: #dadada -1px 0 4px;
box-shadow: #dadada -1px 0 4px; box-shadow: #dadada -1px 0 4px;
cursor: pointer; cursor: pointer;
z-index: 100;
} }
.toggleIcon{ .toggleIcon{
......
...@@ -674,11 +674,18 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is ...@@ -674,11 +674,18 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
mKeyboardPalette->setParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView()); mKeyboardPalette->setParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView());
#else #else
mKeyboardPalette->setParent(0); mKeyboardPalette->setParent(0);
#endif
#ifdef Q_WS_MAC
mKeyboardPalette->setWindowFlags(Qt::Dialog | Qt::Popup | Qt::FramelessWindowHint);
#endif #endif
mKeyboardPalette->show(); mKeyboardPalette->show();
} }
else else
mKeyboardPalette->setParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView()); mKeyboardPalette->setParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView());
#ifdef Q_WS_MAC
mKeyboardPalette->setWindowFlags(Qt::Dialog | Qt::Popup | Qt::FramelessWindowHint);
#endif
} }
mLeftPalette->setVisible(leftPaletteVisible); mLeftPalette->setVisible(leftPaletteVisible);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment