Hello community, here is the log from the commit of package konsole for openSUSE:Factory checked in at 2019-02-04 21:22:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konsole (Old) and /work/SRC/openSUSE:Factory/.konsole.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "konsole" Mon Feb 4 21:22:43 2019 rev:105 rq:667465 version:18.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/konsole/konsole.changes 2019-01-21 10:14:33.710424588 +0100 +++ /work/SRC/openSUSE:Factory/.konsole.new.28833/konsole.changes 2019-02-04 21:22:44.647634824 +0100 @@ -1,0 +2,7 @@ +Mon Jan 21 09:13:17 UTC 2019 - Fabian Vogt <[email protected]> + +- Disable antialiasing to fix appearance of bold lines (kde#401463): + * 0001-Revert-fix-drawing-box-chars-avoid-storing-and-savin.patch + * 0002-Revert-Antialias-line-drawing-characters.patch + +------------------------------------------------------------------- New: ---- 0001-Revert-fix-drawing-box-chars-avoid-storing-and-savin.patch 0002-Revert-Antialias-line-drawing-characters.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konsole.spec ++++++ --- /var/tmp/diff_new_pack.QNNfEc/_old 2019-02-04 21:22:45.263634675 +0100 +++ /var/tmp/diff_new_pack.QNNfEc/_new 2019-02-04 21:22:45.263634675 +0100 @@ -37,7 +37,9 @@ Source25: utilities-terminal-su-64.png Source26: utilities-terminal-su-128.png # PATCH-FIX-OPENSUSE -Patch0: fix-build-with-gcc48.patch +Patch100: fix-build-with-gcc48.patch +Patch101: 0001-Revert-fix-drawing-box-chars-avoid-storing-and-savin.patch +Patch102: 0002-Revert-Antialias-line-drawing-characters.patch BuildRequires: fdupes BuildRequires: kbookmarks-devel BuildRequires: kcompletion-devel @@ -108,10 +110,7 @@ %endif %prep -%setup -q -%if 0%{?suse_version} < 1500 -%patch0 -p1 -%endif +%autosetup -p1 %build %cmake_kf5 -d build ++++++ 0001-Revert-fix-drawing-box-chars-avoid-storing-and-savin.patch ++++++ >From 3b130a9904b2c5913f8bed8d98a0f51d4b248aab Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> 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); } ++++++ 0002-Revert-Antialias-line-drawing-characters.patch ++++++ >From 0ab3963173cdae50709e7d9974737fd4c6cadd0d Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Mon, 21 Jan 2019 10:12:36 +0100 Subject: [PATCH 2/2] Revert "Antialias line drawing characters" This reverts commit ed5fa1f855a05ba82fe4f2f6d3ead803aa5eefdb. --- src/TerminalDisplay.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index d110fa0c..6c1c9aee 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -915,9 +915,6 @@ static void drawBlockChar(QPainter& paint, int x, int y, int w, int h, uchar cod void TerminalDisplay::drawLineCharString(QPainter& painter, int x, int y, const QString& str, const Character* attributes) { - painter.save(); - painter.setRenderHint(QPainter::Antialiasing); - const QPen& originalPen = painter.pen(); if (((attributes->rendition & RE_BOLD) != 0) && _boldIntense) { @@ -938,7 +935,7 @@ void TerminalDisplay::drawLineCharString(QPainter& painter, int x, int y, const } } - painter.restore(); + painter.setPen(originalPen); } void TerminalDisplay::setKeyboardCursorShape(Enum::CursorShapeEnum shape) -- 2.20.1
