[SCM] konsole packaging branch, master, updated. debian/16.12.0-1-15-gc4bb01c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konsole.git;a=commitdiff;h=ac63278

The following commit has been merged in the master branch:
commit ac63278cb94164a4e8288d3f1f9b37a1ea5c52ca
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Jan 28 16:44:03 2017 +0100

    Add new upstream patch: upstream_render_text_at_primary_fonts_baseline.patch
---
 debian/patches/series                              |  1 +
 ...eam_render_text_at_primary_fonts_baseline.patch | 41 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 87808e5..1069adc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Pre-process-the-e-custom-command-argument.patch
+upstream_render_text_at_primary_fonts_baseline.patch
diff --git a/debian/patches/upstream_render_text_at_primary_fonts_baseline.patch b/debian/patches/upstream_render_text_at_primary_fonts_baseline.patch
new file mode 100644
index 0000000..0695ad4
--- /dev/null
+++ b/debian/patches/upstream_render_text_at_primary_fonts_baseline.patch
@@ -0,0 +1,41 @@
+commit 7e2f9d839f5af447a0fc7fd178dd5d8f58e489bb
+Author: Christoph Feck <cfeck at kde.org>
+Date:   Wed Dec 7 20:12:59 2016 +0100
+
+    Render text at primary font's baseline
+    
+    This only addresses the vertical shift and cutoff of lower
+    parts of characters, but not horizontal shift (characters
+    moving to the left or right).
+    
+    See the linked review request for details.
+    
+    This commit is for the 17.04 version. If you can test master
+    builds, please add feedback.
+    
+    REVIEW: 129281
+    CCBUG: 371687
+
+--- a/src/TerminalDisplay.cpp
++++ b/src/TerminalDisplay.cpp
+@@ -855,18 +855,10 @@
+         // This still allows RTL characters to be rendered in the RTL way.
+         painter.setLayoutDirection(Qt::LeftToRight);
+ 
+-        // the drawText(rect,flags,string) overload is used here with null flags
+-        // instead of drawText(rect,string) because the (rect,string) overload causes
+-        // the application's default layout direction to be used instead of
+-        // the widget-specific layout direction, which should always be
+-        // Qt::LeftToRight for this widget
+-        //
+-        // This was discussed in: http://lists.kde.org/?t=120552223600002&r=1&w=2
+         if (_bidiEnabled) {
+-            painter.drawText(rect, 0, text);
++            painter.drawText(rect.x(), rect.y() + _fontAscent + _lineSpacing, text);
+         } else {
+-            // See bug 280896 for more info
+-            painter.drawText(rect, Qt::AlignBottom, LTR_OVERRIDE_CHAR + text);
++            painter.drawText(rect.x(), rect.y() + _fontAscent + _lineSpacing, LTR_OVERRIDE_CHAR + text);
+         }
+     }
+ }

-- 
konsole packaging