diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-16 21:26:15 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-12-17 09:10:46 +0000 |
| commit | 3d3e95d68557e93224ebdf75a2ac56acf42e7d44 (patch) | |
| tree | f4ff4504a8e47dac8a1c2d55f521a8498159c69e | |
| parent | 9d76a0cb7e6525d41a7e5c3c5d96e9b8a5d75603 (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sd/source/ui/annotations/annotationwindow.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index eecc0e33aae3..dcbeb2262a75 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() |