|
 |
69cc7b |
From 47f913ccf293665bd8c7737917c8284f16f95166 Mon Sep 17 00:00:00 2001
|
|
|
69cc7b |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
69cc7b |
Date: Fri, 3 Nov 2017 15:53:22 +0000
|
|
|
69cc7b |
Subject: [PATCH] gtk3: fix popover placement in RTL
|
|
|
69cc7b |
|
|
|
69cc7b |
Change-Id: I8c20b277ce943f915941b2af9353f98c66f9065c
|
|
|
69cc7b |
---
|
|
|
69cc7b |
vcl/unx/gtk3/gtk3gtkframe.cxx | 9 ++++++---
|
|
|
69cc7b |
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
69cc7b |
|
|
|
69cc7b |
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
69cc7b |
index cdbd1b3..61446c7 100644
|
|
|
69cc7b |
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
69cc7b |
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
69cc7b |
@@ -2480,7 +2480,7 @@ bool GtkSalFrame::ShowTooltip(const OUString& rHelpText, const Rectangle& rHelpA
|
|
|
69cc7b |
#if GTK_CHECK_VERSION(3,12,0)
|
|
|
69cc7b |
namespace
|
|
|
69cc7b |
{
|
|
|
69cc7b |
- void set_pointing_to(GtkPopover *pPopOver, const Rectangle& rHelpArea)
|
|
|
69cc7b |
+ void set_pointing_to(GtkPopover *pPopOver, const Rectangle& rHelpArea, const SalFrameGeometry& rGeometry)
|
|
|
69cc7b |
{
|
|
|
69cc7b |
GdkRectangle aRect;
|
|
|
69cc7b |
aRect.x = rHelpArea.Left();
|
|
|
69cc7b |
@@ -2501,6 +2501,9 @@ namespace
|
|
|
69cc7b |
break;
|
|
|
69cc7b |
}
|
|
|
69cc7b |
|
|
|
69cc7b |
+ if (AllSettings::GetLayoutRTL())
|
|
|
69cc7b |
+ aRect.x = rGeometry.nWidth-aRect.width-1-aRect.x;
|
|
|
69cc7b |
+
|
|
|
69cc7b |
gtk_popover_set_pointing_to(pPopOver, &aRect);
|
|
|
69cc7b |
}
|
|
|
69cc7b |
}
|
|
|
69cc7b |
@@ -2523,7 +2526,7 @@ sal_uIntPtr GtkSalFrame::ShowPopover(const OUString& rHelpText, const Rectangle&
|
|
|
69cc7b |
else if (nFlags & QuickHelpFlags::Right)
|
|
|
69cc7b |
gtk_popover_set_position(GTK_POPOVER(pWidget), GTK_POS_LEFT);
|
|
|
69cc7b |
|
|
|
69cc7b |
- set_pointing_to(GTK_POPOVER(pWidget), rHelpArea);
|
|
|
69cc7b |
+ set_pointing_to(GTK_POPOVER(pWidget), rHelpArea, maGeometry);
|
|
|
69cc7b |
|
|
|
69cc7b |
gtk_popover_set_modal(GTK_POPOVER(pWidget), false);
|
|
|
69cc7b |
|
|
|
69cc7b |
@@ -2543,7 +2546,7 @@ bool GtkSalFrame::UpdatePopover(sal_uIntPtr nId, const OUString& rHelpText, cons
|
|
|
69cc7b |
#if GTK_CHECK_VERSION(3,12,0)
|
|
|
69cc7b |
GtkWidget *pWidget = reinterpret_cast<GtkWidget*>(nId);
|
|
|
69cc7b |
|
|
|
69cc7b |
- set_pointing_to(GTK_POPOVER(pWidget), rHelpArea);
|
|
|
69cc7b |
+ set_pointing_to(GTK_POPOVER(pWidget), rHelpArea, maGeometry);
|
|
|
69cc7b |
|
|
|
69cc7b |
GtkWidget *pLabel = gtk_bin_get_child(GTK_BIN(pWidget));
|
|
|
69cc7b |
OString sUTF = OUStringToOString(rHelpText, RTL_TEXTENCODING_UTF8);
|
|
|
69cc7b |
--
|
|
|
69cc7b |
2.9.5
|
|
|
69cc7b |
|