[libreoffice] 04/05: backport KDE4 RTL scrollbar handling fix from libreoffice-5-0
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 32d2a60ea8d30e13fb633e2530ad89b0de721869
Author: Rene Engelhard <rene@debian.org>
Date: Fri Aug 28 11:34:16 2015 +0200
backport KDE4 RTL scrollbar handling fix from libreoffice-5-0
---
changelog | 2 ++
patches/kde4-rtl.diff | 30 ++++++++++++++++++++++++++++++
patches/series | 1 +
3 files changed, 33 insertions(+)
diff --git a/changelog b/changelog
index bd6c6a6..cd39f41 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ libreoffice (1:5.0.1~rc2-2) UNRELEASED; urgency=medium
* debian/patches/mysqlcppconn-libmysqlclient-SONAME.diff: update; fix internal
mysqlcppconn build
+ * debian/patches/kde4-rtl.diff: KDE4: fix RTL scrollbar handling, from
+ libreoffice-5-0
* debian/rules:
- two more s/src/tarballs/ I forgot
diff --git a/patches/kde4-rtl.diff b/patches/kde4-rtl.diff
new file mode 100644
index 0000000..79b2f3e
--- /dev/null
+++ b/patches/kde4-rtl.diff
@@ -0,0 +1,30 @@
+From 125fd9e3df5b33b9cd80de1ee3e4fa64c8587387 Mon Sep 17 00:00:00 2001
+From: Jan-Marek Glogowski <glogow@fbihome.de>
+Date: Wed, 26 Aug 2015 15:29:15 +0000
+Subject: tdf#80512 KDE4: fix RTL scrollbar handling
+
+Just invert the scrollbar the same way gtk+ does by checking the
+button positions and adjust the drawing style accordingly.
+
+Change-Id: I3475c33e074c1509a73da618a4efa44dc61a1a77
+(cherry picked from commit 273df1762707d1d44c9f9b3911e06f7a5a4fa08f)
+Reviewed-on: https://gerrit.libreoffice.org/18033
+Tested-by: Jenkins <ci@libreoffice.org>
+Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
+
+diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
+index 7e1a881..a1a5351 100644
+--- a/vcl/unx/kde4/KDESalGraphics.cxx
++++ b/vcl/unx/kde4/KDESalGraphics.cxx
+@@ -475,6 +475,8 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
+ option.sliderValue = sbVal->mnCur;
+ option.sliderPosition = sbVal->mnCur;
+ option.pageStep = sbVal->mnVisibleSize;
++ if (part == PART_DRAW_BACKGROUND_HORZ)
++ option.upsideDown = sbVal->maButton1Rect.Left() > sbVal->maButton2Rect.Left();
+
+ //setup the active control...always the slider
+ if (sbVal->mnThumbState & ControlState::ROLLOVER)
+--
+cgit v0.10.2
+
diff --git a/patches/series b/patches/series
index d9dc9e4..e971940 100644
--- a/patches/series
+++ b/patches/series
@@ -31,3 +31,4 @@ rsc-no-error-about-unknown-switch.diff
liborcus-0.9.1.diff
disable-tiledrendering-test.diff
gtk3-rtl.diff
+kde4-rtl.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: