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

44d443f8 · Anatoly Mihalchenko · 2782a7d1 · 46d85623 · 44d443f8
Commit 44d443f8 authored Sep 11, 2012 by Anatoly Mihalchenko
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

UBDesktopAnnotationController.cpp src/desktop/UBDesktopAnnotationController.cpp +4 -4

No files found.
--- a/src/desktop/UBDesktopAnnotationController.cpp
+++ b/src/desktop/UBDesktopAnnotationController.cpp
@@ -158,10 +158,10 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent, UB
    onDesktopPaletteMaximized();

    // FIX #633: Ensure that these palettes stay on top of the other elements
-    mDesktopEraserPalette->raise();
-    mDesktopMarkerPalette->raise();
-    mDesktopPenPalette->raise();
-    mDesktopPalette->raise();
+    //mDesktopEraserPalette->raise();
+    //mDesktopMarkerPalette->raise();
+    //mDesktopPenPalette->raise();
+    //mDesktopPalette->raise();
 }

 UBDesktopAnnotationController::~UBDesktopAnnotationController()