rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

final wayland placement fixes

Browse Source
This commit is contained in:
Caolán McNamara 2015-12-18 09:56:50 +00:00
parent 1bd7201834
commit d900c98ad9
3 changed files with 97 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
0001-these-popups-should-start-invisible-and-take-default.patch Normal file
View File

@ -0,0 +1,49 @@
From bd8559a4722825b4a1fdb33042b90b63295ef835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 17 Dec 2015 16:33:41 +0000
Subject: [PATCH 1/2] these popups should start invisible and take default
popup menu bits
so they can position correctly under wayland
Change-Id: Idf65c0ef27be5aa6027a516207fd34c2e03407ca
---
svx/uiconfig/ui/floatingundoredo.ui | 1 -
svx/uiconfig/ui/paralinespacingcontrol.ui | 2 --
2 files changed, 3 deletions(-)
diff --git a/svx/uiconfig/ui/floatingundoredo.ui b/svx/uiconfig/ui/floatingundoredo.ui
index 66f30a6..2c48f82 100644
--- a/svx/uiconfig/ui/floatingundoredo.ui
+++ b/svx/uiconfig/ui/floatingundoredo.ui
@@ -11,7 +11,6 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">popup-menu</property>
<property name="skip_pager_hint">True</property>
- <property name="decorated">False</property>
<property name="deletable">False</property>
<child>
<object class="GtkBox" id="box">
diff --git a/svx/uiconfig/ui/paralinespacingcontrol.ui b/svx/uiconfig/ui/paralinespacingcontrol.ui
index 5d7402b..67ca9c1 100644
--- a/svx/uiconfig/ui/paralinespacingcontrol.ui
+++ b/svx/uiconfig/ui/paralinespacingcontrol.ui
@@ -45,7 +45,6 @@
<property name="icon-size">1</property>
</object>
<object class="GtkWindow" id="ParaLineSpacingControl">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
@@ -54,7 +53,6 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">popup-menu</property>
<property name="skip_pager_hint">True</property>
- <property name="decorated">False</property>
<property name="deletable">False</property>
<child>
<object class="GtkGrid" id="grid2">
--
2.5.0

46
0002-disable-tearability-of-color-window.patch Normal file
View File

@ -0,0 +1,46 @@
From 011f42c0c6104228f5c15daae58e432ccf2be69d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 17 Dec 2015 17:04:52 +0000
Subject: [PATCH 2/2] disable tearability of color window
the new popup controllers take care to destroy the popup
and recreate a non-popup and move the contents into it
so we should re-implement the color popup as one of those
in the meantime, turn it into a non-tearable thing
Change-Id: I6ba26bf19badcbf910b7200b7e1b8b2a64ce4eec
---
svx/source/tbxctrls/tbcontrl.cxx | 3 +--
svx/uiconfig/ui/colorwindow.ui | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index ae696ae..28691dc 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2659,8 +2659,7 @@ VclPtr<SfxPopupWindow> SvxColorToolBoxControl::CreatePopupWindow()
break;
}
- pColorWin->StartPopupMode( &GetToolBox(),
- FloatWinPopupFlags::AllowTearOff|FloatWinPopupFlags::NoAppFocusClose );
+ pColorWin->StartPopupMode( &GetToolBox(), FloatWinPopupFlags::NoAppFocusClose );
pColorWin->StartSelection();
SetPopupWindow( pColorWin );
if ( !bSidebarType )
diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 9482562..702bee3 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -25,7 +25,6 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">popup-menu</property>
<property name="skip_pager_hint">True</property>
- <property name="decorated">False</property>
<property name="deletable">False</property>
<child>
<object class="GtkBox" id="box1">
--
2.5.0

2
libreoffice.spec
View File

@ -250,6 +250,8 @@ Patch12: 0001-impress-s-AnnotationWindow-is-the-only-user-of-WB_NE.patch
Patch13: 0002-remove-newly-unused-WB_NEEDSFOCUS-and-fragile-FLOAT_.patch
Patch14: 0003-gtk3-wayland-start-floating-windows-hidden.patch
Patch15: 0001-tdf-95450-avoid-double-swap-on-big-endian-arches.patch
Patch16: 0001-these-popups-should-start-invisible-and-take-default.patch
Patch17: 0002-disable-tearability-of-color-window.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice