This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit c2122e28c4258fa1a7c8c11c3e748091ba9005a6
Author: Rene Engelhard <r...@debian.org>
Date: Mon Aug 24 11:36:13 2015 +0200
more gtk3 rtl updates from master
---
changelog | 4 +--
patches/gtk3-rtl.diff | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 72 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 0224fdb..97e05a1 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,8 @@ libreoffice (1:5.0.1~rc2-1) UNRELEASED; urgency=medium
* New upstream release candidate
- * debian/patches/gtk3-rtl.diff: backport GTk3 RTL fixes (arrows, checkboxes)
- from libreoffice-5-0
+ * debian/patches/gtk3-rtl.diff: backport GTK3 RTL fixes (arrows, checkboxes,
+ spin buttons) from libreoffice-5-0 and master
* debian/rules:
- bump libmysqlcppconn-dev and libclucene-dev build-deps to their
diff --git a/patches/gtk3-rtl.diff b/patches/gtk3-rtl.diff
index 3d9a72f..7c0f77e 100644
--- a/patches/gtk3-rtl.diff
+++ b/patches/gtk3-rtl.diff
@@ -102,3 +102,73 @@ index 126d6d1..1f04b2e 100644
--
cgit v0.10.2
+From e2582341af9f6b756e5d95c8ddd99652b62d1a41 Mon Sep 17 00:00:00 2001
+From: Khaled Hosny <khaledho...@eglug.org>
+Date: Mon, 17 Aug 2015 04:00:49 +0200
+Subject: Fix GTK3 right-to-left rendering of spin buttons
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The button were not drawn at all
+
+Change-Id: I51dfa30a6daa1034b5e978b09bcdfcc83e859f3d
+Reviewed-on: https://gerrit.libreoffice.org/17790
+Reviewed-by: Caolán McNamara <caol...@redhat.com>
+Tested-by: Caolán McNamara <caol...@redhat.com>
+
+diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+index 8ee0d0a..7344423 100644
+--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
++++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+@@ -139,25 +139,40 @@ Rectangle GtkSalGraphics::NWGetSpinButtonRect(
ControlPart nPart, Rectangle aAre
+ buttonRect.SetSize(Size(buttonWidth, buttonHeight));
+ buttonRect.setY(aAreaRect.Top());
+ buttonRect.Bottom() = buttonRect.Top() + aAreaRect.GetHeight();
++ Rectangle partRect(buttonRect);
+ if ( nPart == PART_BUTTON_UP )
+ {
+- buttonRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() -
buttonRect.GetWidth()));
++ if (AllSettings::GetLayoutRTL())
++ partRect.setX(aAreaRect.Left());
++ else
++ partRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() -
buttonRect.GetWidth()));
+ }
+ else if( nPart == PART_BUTTON_DOWN )
+ {
+- buttonRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() -
2*buttonRect.GetWidth()));
++ if (AllSettings::GetLayoutRTL())
++ partRect.setX(aAreaRect.Left() + buttonRect.GetWidth());
++ else
++ partRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() - 2 *
buttonRect.GetWidth()));
+ }
+ else
+ {
+- buttonRect.Right() = (aAreaRect.Left() + (aAreaRect.GetWidth() -
2*buttonRect.GetWidth()))-1;
+- buttonRect.Left() = aAreaRect.Left();
+- buttonRect.Top() = aAreaRect.Top();
+- buttonRect.Bottom() = aAreaRect.Bottom();
++ if (AllSettings::GetLayoutRTL())
++ {
++ partRect.Right() = aAreaRect.Left() + aAreaRect.GetWidth();
++ partRect.Left() = aAreaRect.Left() + (2 * buttonRect.GetWidth())
- 1;
++ }
++ else
++ {
++ partRect.Right() = (aAreaRect.Left() + (aAreaRect.GetWidth() - 2
* buttonRect.GetWidth())) - 1;
++ partRect.Left() = aAreaRect.Left();
++ }
++ partRect.Top() = aAreaRect.Top();
++ partRect.Bottom() = aAreaRect.Bottom();
+ }
+
+ gtk_style_context_restore(mpSpinStyle);
+
+- return buttonRect;
++ return partRect;
+ }
+
+ Rectangle GtkSalGraphics::NWGetScrollButtonRect( ControlPart nPart, Rectangle
aAreaRect )
+--
+cgit v0.10.2
+
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
