Commit 44d443f8 authored by Anatoly Mihalchenko's avatar Anatoly Mihalchenko

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

parents 2782a7d1 46d85623
...@@ -158,10 +158,10 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent, UB ...@@ -158,10 +158,10 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent, UB
onDesktopPaletteMaximized(); onDesktopPaletteMaximized();
// FIX #633: Ensure that these palettes stay on top of the other elements // FIX #633: Ensure that these palettes stay on top of the other elements
mDesktopEraserPalette->raise(); //mDesktopEraserPalette->raise();
mDesktopMarkerPalette->raise(); //mDesktopMarkerPalette->raise();
mDesktopPenPalette->raise(); //mDesktopPenPalette->raise();
mDesktopPalette->raise(); //mDesktopPalette->raise();
} }
UBDesktopAnnotationController::~UBDesktopAnnotationController() UBDesktopAnnotationController::~UBDesktopAnnotationController()
......
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