Accepting request 960568 from LibreOffice:7.3

- Refresh fix_gtk_popover_on_3.20.patch

OBS-URL: https://build.opensuse.org/request/show/960568
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=997
This commit is contained in:
Danilo Spinella 2022-03-09 16:36:09 +00:00 committed by Git OBS Bridge
parent 85f0edc7fe
commit 5e70ee5752
2 changed files with 18 additions and 10 deletions

View File

@ -1,11 +1,11 @@
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx Index: libreoffice-7.3.1.3/vcl/unx/gtk3/gtkinst.cxx
index 6b592b3..2fce9eb 100644 ===================================================================
--- a/vcl/unx/gtk3/gtkinst.cxx --- libreoffice-7.3.1.3.orig/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx +++ libreoffice-7.3.1.3/vcl/unx/gtk3/gtkinst.cxx
@@ -21415,12 +21415,16 @@ public: @@ -22177,7 +22177,11 @@ public:
gtk_popover_set_relative_to(m_pPopover, pWidget); }
#endif #endif
gtk_popover_set_pointing_to(m_pPopover, &aRect);
- gtk_popover_popup(m_pPopover); - gtk_popover_popup(m_pPopover);
+ // in GTK 3.22 you can just call gtk_popover_popup() to get it to show with transitions, + // in GTK 3.22 you can just call gtk_popover_popup() to get it to show with transitions,
+ // but on SLE-12-SP5 we just have GTK 3.20, so enable transitions and show it to get the + // but on SLE-12-SP5 we just have GTK 3.20, so enable transitions and show it to get the
@ -14,10 +14,13 @@ index 6b592b3..2fce9eb 100644
+ gtk_widget_show(GTK_WIDGET(m_pPopover)); + gtk_widget_show(GTK_WIDGET(m_pPopover));
} }
virtual void popdown() override #if !GTK_CHECK_VERSION(4, 0, 0)
{ @@ -22218,7 +22222,7 @@ public:
}
#endif
- gtk_popover_popdown(m_pPopover); - gtk_popover_popdown(m_pPopover);
+ gtk_widget_hide(GTK_WIDGET(m_pPopover)); + gtk_widget_hide(GTK_WIDGET(m_pPopover));
} }
virtual ~GtkInstancePopover() override void PopdownAndFlushClosedSignal()

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 9 16:33:59 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
- Refresh fix_gtk_popover_on_3.20.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Mar 5 14:30:08 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com> Sat Mar 5 14:30:08 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>