[Libreoffice-commits] core.git: sd/source

[Caolán McNamara]

 sd/source/ui/annotations/annotationwindow.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3d3e95d68557e93224ebdf75a2ac56acf42e7d44
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 16 21:26:15 2015 +0000

    impress's AnnotationWindow is the only user of WB_NEEDSFOCUS
    
    Here it is creating a toplevel floating system window which needs special
    hackery to function.
    
    Instead convert it to a non-system window which means that it is in reality
    only a vcl construct. The small downside is that it is now unable to leave the
    confines of the toplevel system window in which it lives. Upside is that
    all the special hackery related to it which generally doesn't work half the time
    in various window managers and now in wayland can go away.
    
    Change-Id: I7ad7c35091086f7671ff4a178c7fa04202c20e09
    Reviewed-on: https://gerrit.libreoffice.org/20745
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index eecc0e3..dcbeb22 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -272,7 +272,7 @@ Selection AnnotationTextWindow::GetSurroundingTextSelection() const
 /************** AnnotationWindow***********************************++*/
 
 AnnotationWindow::AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShell* pDocShell, vcl::Window* pParent )
-: FloatingWindow(pParent, WB_SYSTEMWINDOW|WB_BORDER|WB_NEEDSFOCUS)
+: FloatingWindow(pParent, WB_BORDER)
 , mrManager( rManager )
 , mpDocShell( pDocShell )
 , mpDoc( pDocShell->GetDoc() )
@@ -285,6 +285,7 @@ AnnotationWindow::AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShel
 , mpTextWindow(nullptr)
 , mpMeta(nullptr)
 {
+    EnableAlwaysOnTop();
 }
 
 AnnotationWindow::~AnnotationWindow()