File 0001-Revert-fix-drawing-box-chars-avoid-storing... of Package konsole

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Revert-fix-drawing-box-chars-avoid-storing-and-savin.patch of Package konsole (Revision 25bf0afae341648b73950cd958d82559)

Currently displaying revision 25bf0afae341648b73950cd958d82559 , Show latest

From 3b130a9904b2c5913f8bed8d98a0f51d4b248aab Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Mon, 21 Jan 2019 10:12:18 +0100
Subject: [PATCH 1/2] Revert "fix drawing box chars, avoid storing and saving
 state all the time"

This reverts commit 14b3c8be2c15ed9711b1308b4a991de4aad5802d.
---
 src/TerminalDisplay.cpp | 45 +++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

Index: konsole-18.12.1/src/TerminalDisplay.cpp
===================================================================
--- konsole-18.12.1.orig/src/TerminalDisplay.cpp
+++ konsole-18.12.1/src/TerminalDisplay.cpp
@@ -619,7 +619,7 @@ static void drawLineChar(QPainter& paint
 {
     //Calculate cell midpoints, end points.
     const int cx = x + w / 2;
-    const int cy = y + h / 2. - 0.5;
+    const int cy = y + h / 2;
     const int ex = x + w - 1;
     const int ey = y + h - 1;
 
@@ -671,33 +671,33 @@ static void drawLineChar(QPainter& paint
 
     //Intersection points.
     if ((toDraw & Int11) != 0u) {
-        paint.drawPoint(cx - 2, cy - 2);
+        paint.drawPoint(cx - 1, cy - 1);
     }
     if ((toDraw & Int12) != 0u) {
-        paint.drawPoint(cx - 1, cy - 2);
+        paint.drawPoint(cx, cy - 1);
     }
     if ((toDraw & Int13) != 0u) {
-        paint.drawPoint(cx - 0, cy - 2);
+        paint.drawPoint(cx + 1, cy - 1);
     }
 
     if ((toDraw & Int21) != 0u) {
-        paint.drawPoint(cx - 2, cy - 1);
+        paint.drawPoint(cx - 1, cy);
     }
     if ((toDraw & Int22) != 0u) {
-        paint.drawPoint(cx - 1, cy - 1);
+        paint.drawPoint(cx, cy);
     }
     if ((toDraw & Int23) != 0u) {
-        paint.drawPoint(cx - 0, cy - 1);
+        paint.drawPoint(cx + 1, cy);
     }
 
     if ((toDraw & Int31) != 0u) {
-        paint.drawPoint(cx - 2, cy);
+        paint.drawPoint(cx - 1, cy + 1);
     }
     if ((toDraw & Int32) != 0u) {
-        paint.drawPoint(cx - 1, cy);
+        paint.drawPoint(cx, cy + 1);
     }
     if ((toDraw & Int33) != 0u) {
-        paint.drawPoint(cx - 0, cy);
+        paint.drawPoint(cx + 1, cy + 1);
     }
 }
 
@@ -705,7 +705,7 @@ static void drawOtherChar(QPainter& pain
 {
     //Calculate cell midpoints, end points.
     const int cx = x + w / 2;
-    const int cy = y + h / 2. - 0.5; // Compensate for the translation, to match fonts
+    const int cy = y + h / 2;
     const int ex = x + w - 1;
     const int ey = y + h - 1;
 
@@ -792,17 +792,16 @@ void TerminalDisplay::drawLineCharString
         const Character* attributes)
 {
     painter.save();
+    painter.setRenderHint(QPainter::Antialiasing);
 
-    // For antialiasing, we need to shift it so the single pixel width is in the middle
-    painter.translate(0.5, 0.5);
+    const QPen& originalPen = painter.pen();
 
     if (((attributes->rendition & RE_BOLD) != 0) && _boldIntense) {
-        QPen boldPen(painter.pen());
-        boldPen.setWidth(4);
+        QPen boldPen(originalPen);
+        boldPen.setWidth(3);
         painter.setPen(boldPen);
     }
 
-
     for (int i = 0 ; i < str.length(); i++) {
         const uchar code = str[i].cell();
         if (LineChars[code] != 0u) {
@@ -910,10 +909,10 @@ void TerminalDisplay::drawBackground(QPa
         QColor color(backgroundColor);
         color.setAlpha(qAlpha(_blendColor));
 
-        const QPainter::CompositionMode originalMode = painter.compositionMode();
+        painter.save();
         painter.setCompositionMode(QPainter::CompositionMode_Source);
         painter.fillRect(rect, color);
-        painter.setCompositionMode(originalMode);
+        painter.restore();
 #endif
     } else {
         painter.fillRect(rect, backgroundColor);
@@ -1042,6 +1041,8 @@ void TerminalDisplay::drawTextFragment(Q
                                        const QString& text,
                                        const Character* style)
 {
+    painter.save();
+
     // setup painter
     const QColor foregroundColor = style->foregroundColor.color(_colorTable);
     const QColor backgroundColor = style->backgroundColor.color(_colorTable);
@@ -1061,6 +1062,8 @@ void TerminalDisplay::drawTextFragment(Q
 
     // draw text
     drawCharacters(painter, rect, text, style, invertCharacterColor);
+
+    painter.restore();
 }
 
 void TerminalDisplay::drawPrinterFriendlyTextFragment(QPainter& painter,
@@ -1068,6 +1071,8 @@ void TerminalDisplay::drawPrinterFriendl
         const QString& text,
         const Character* style)
 {
+    painter.save();
+
     // Set the colors used to draw to black foreground and white
     // background for printer friendly output when printing
     Character print_style = *style;
@@ -1076,6 +1081,8 @@ void TerminalDisplay::drawPrinterFriendl
 
     // draw text
     drawCharacters(painter, rect, text, &print_style, false);
+
+    painter.restore();
 }
 
 void TerminalDisplay::setRandomSeed(uint randomSeed)
@@ -1492,8 +1499,6 @@ void TerminalDisplay::paintEvent(QPaintE
         drawBackground(paint, rect, getBackgroundColor(), true /* use opacity setting */);
     }
 
-    paint.setRenderHint(QPainter::Antialiasing, _antialiasText);
-
     foreach(const QRect & rect, dirtyImageRegion.rects()) {
         drawContents(paint, rect);
     }

Places

File 0001-Revert-fix-drawing-box-chars-avoid-storing-and-savin.patch of Package konsole (Revision 25bf0afae341648b73950cd958d82559)

Places