|
 |
f325b2 |
From 94341df754fddacefb01638e5c544a5ba66de750 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
f325b2 |
Date: Wed, 16 Dec 2015 21:26:15 +0000
|
|
|
f325b2 |
Subject: [PATCH] impress's AnnotationWindow is the only user of WB_NEEDSFOCUS
|
|
|
f325b2 |
MIME-Version: 1.0
|
|
|
f325b2 |
Content-Type: text/plain; charset=UTF-8
|
|
|
f325b2 |
Content-Transfer-Encoding: 8bit
|
|
|
f325b2 |
|
|
|
f325b2 |
Here it is creating a toplevel floating system window which needs special
|
|
|
f325b2 |
hackery to function.
|
|
|
f325b2 |
|
|
|
f325b2 |
Instead convert it to a non-system window which means that it is in reality
|
|
|
f325b2 |
only a vcl construct. The small downside is that it is now unable to leave the
|
|
|
f325b2 |
confines of the toplevel system window in which it lives. Upside is that
|
|
|
f325b2 |
all the special hackery related to it which generally doesn't work half the time
|
|
|
f325b2 |
in various window managers and now in wayland can go away.
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I7ad7c35091086f7671ff4a178c7fa04202c20e09
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/20745
|
|
|
f325b2 |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f325b2 |
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sd/source/ui/annotations/annotationwindow.cxx | 3 ++-
|
|
|
f325b2 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
|
|
|
f325b2 |
index bcad03d..c307f1d 100644
|
|
|
f325b2 |
--- a/sd/source/ui/annotations/annotationwindow.cxx
|
|
|
f325b2 |
+++ b/sd/source/ui/annotations/annotationwindow.cxx
|
|
|
f325b2 |
@@ -273,7 +273,7 @@ Selection AnnotationTextWindow::GetSurroundingTextSelection() const
|
|
|
f325b2 |
/************** AnnotationWindow***********************************++*/
|
|
|
f325b2 |
|
|
|
f325b2 |
AnnotationWindow::AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShell* pDocShell, vcl::Window* pParent )
|
|
|
f325b2 |
-: FloatingWindow(pParent, WB_SYSTEMWINDOW|WB_BORDER|WB_NEEDSFOCUS)
|
|
|
f325b2 |
+: FloatingWindow(pParent, WB_BORDER)
|
|
|
f325b2 |
, mrManager( rManager )
|
|
|
f325b2 |
, mpDocShell( pDocShell )
|
|
|
f325b2 |
, mpView( pDocShell->GetViewShell()->GetView() )
|
|
|
f325b2 |
@@ -287,6 +287,7 @@ AnnotationWindow::AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShel
|
|
|
f325b2 |
, mpTextWindow(0)
|
|
|
f325b2 |
, mpMeta(0)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
+ EnableAlwaysOnTop();
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
AnnotationWindow::~AnnotationWindow()
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.5.0
|
|
|
f325b2 |
|