[libreoffice] 01/03: git update; the master part of gtk3-rtl.diff is also in -5-0 now
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit 69afb93dc7d60624a4ff9a37147dcb8318d5be1b
Author: Rene Engelhard <rene@debian.org>
Date: Wed Aug 26 14:46:14 2015 +0200
git update; the master part of gtk3-rtl.diff is also in -5-0 now
---
changelog | 2 +-
patches/gtk3-rtl.diff | 70 ---------------------------------------------------
patches/series | 1 -
3 files changed, 1 insertion(+), 72 deletions(-)
diff --git a/changelog b/changelog
index 83846c3..0a44b3f 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.0.2~rc1~git20150822-1) UNRELEASED; urgency=medium
+libreoffice (1:5.0.2~rc1~git20150826-1) UNRELEASED; urgency=medium
* New upstream snapshot
diff --git a/patches/gtk3-rtl.diff b/patches/gtk3-rtl.diff
deleted file mode 100644
index 937e888..0000000
--- a/patches/gtk3-rtl.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-From e2582341af9f6b756e5d95c8ddd99652b62d1a41 Mon Sep 17 00:00:00 2001
-From: Khaled Hosny <khaledhosny@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 <caolanm@redhat.com>
-Tested-by: Caolán McNamara <caolanm@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
-
diff --git a/patches/series b/patches/series
index d9dc9e4..8d6e17e 100644
--- a/patches/series
+++ b/patches/series
@@ -30,4 +30,3 @@ gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
liborcus-0.9.1.diff
disable-tiledrendering-test.diff
-gtk3-rtl.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: