diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
commit | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch) | |
tree | 9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /kde-apps/konsole/files | |
parent | 2891d29af8907ce881662f4a02844926d7a293c7 (diff) |
gentoo resync : 12.01.2019
Diffstat (limited to 'kde-apps/konsole/files')
-rw-r--r-- | kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch | 58 | ||||
-rw-r--r-- | kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch | 188 |
2 files changed, 0 insertions, 246 deletions
diff --git a/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch b/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch deleted file mode 100644 index 36aabaaccc54..000000000000 --- a/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch +++ /dev/null @@ -1,58 +0,0 @@ -From b48ecb5712037027e6385515c9eced7fabfc3dc3 Mon Sep 17 00:00:00 2001 -From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org> -Date: Mon, 10 Dec 2018 10:09:35 -0500 -Subject: fix cursor when anti aliasing is enabled - -Summary: -When there is a margin of 1 pixel, but some of the anti-aliasing -"blur" leaks to 0,0. so it is fixed with a full update() (e. g. when -it regains focus), but not when just some content updates in the -window. Without this it draws outside the content rect, most -visible as a vertical line if the cursor is completely to the left and -then moves. - -Reviewers: #konsole, hindenburg - -Reviewed By: #konsole, hindenburg - -Subscribers: pbraun, konsole-devel, #konsole - -Tags: #konsole - -Differential Revision: https://phabricator.kde.org/D17414 - -(cherry picked from commit e7085310d6d594823d0ed491fa8bdbd99dec4932) ---- - src/TerminalDisplay.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp -index 6e8b262..64c831c 100644 ---- a/src/TerminalDisplay.cpp -+++ b/src/TerminalDisplay.cpp -@@ -933,7 +933,7 @@ void TerminalDisplay::drawCursor(QPainter& painter, - - // shift rectangle top down one pixel to leave some space - // between top and bottom -- QRect cursorRect = rect.adjusted(0, 1, 0, 0); -+ QRectF cursorRect = rect.adjusted(0, 1, 0, 0); - - QColor cursorColor = _cursorColor.isValid() ? _cursorColor : foregroundColor; - painter.setPen(cursorColor); -@@ -942,10 +942,10 @@ void TerminalDisplay::drawCursor(QPainter& painter, - // draw the cursor outline, adjusting the area so that - // it is draw entirely inside 'rect' - int penWidth = qMax(1, painter.pen().width()); -- painter.drawRect(cursorRect.adjusted(penWidth / 2, -- penWidth / 2, -- - penWidth / 2 - penWidth % 2, -- - penWidth / 2 - penWidth % 2)); -+ painter.drawRect(cursorRect.adjusted(penWidth / 2 + 0.5, -+ penWidth / 2 + 0.5, -+ - penWidth / 2 - penWidth % 2 + 0.5, -+ - penWidth / 2 - penWidth % 2 + 0.5)); - - // draw the cursor body only when the widget has focus - if (hasFocus()) { --- -cgit v1.1 diff --git a/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch b/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch deleted file mode 100644 index 1847543737af..000000000000 --- a/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch +++ /dev/null @@ -1,188 +0,0 @@ -From 807ac77061604c2ac7cf84b0a0b29dd949a6c634 Mon Sep 17 00:00:00 2001 -From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org> -Date: Thu, 6 Dec 2018 10:02:41 -0500 -Subject: fix drawing box chars, avoid storing and saving state all the time - -Summary: -to get the box chars to be drawn correctly we need to turn on high -quality antialiasing in qpainter. in addition only turn it on if -antialiasing is enabled. - -lastly qpainter.save()/restore() is called very often, so try to avoid -that if it isn't necessary. - -BUG: 401463 - -Test Plan: -`cat tests/boxes.txt` - -old: - -{F6428268} - -new: - -{F6450304} - -Reviewers: #konsole, hindenburg - -Reviewed By: #konsole, hindenburg - -Subscribers: wbauer, konsole-devel, #konsole - -Tags: #konsole - -Differential Revision: https://phabricator.kde.org/D16947 - -(cherry picked from commit 14b3c8be2c15ed9711b1308b4a991de4aad5802d) ---- - src/TerminalDisplay.cpp | 45 ++++++++++++++++++++------------------------- - 1 file changed, 20 insertions(+), 25 deletions(-) - -diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp -index 722e200..2b14556 100644 ---- a/src/TerminalDisplay.cpp -+++ b/src/TerminalDisplay.cpp -@@ -619,7 +619,7 @@ static void drawLineChar(QPainter& paint, int x, int y, int w, int h, uchar code - { - //Calculate cell midpoints, end points. - const int cx = x + w / 2; -- const int cy = y + h / 2; -+ const int cy = y + h / 2. - 0.5; - const int ex = x + w - 1; - const int ey = y + h - 1; - -@@ -671,33 +671,33 @@ static void drawLineChar(QPainter& paint, int x, int y, int w, int h, uchar code - - //Intersection points. - if ((toDraw & Int11) != 0u) { -- paint.drawPoint(cx - 1, cy - 1); -+ paint.drawPoint(cx - 2, cy - 2); - } - if ((toDraw & Int12) != 0u) { -- paint.drawPoint(cx, cy - 1); -+ paint.drawPoint(cx - 1, cy - 2); - } - if ((toDraw & Int13) != 0u) { -- paint.drawPoint(cx + 1, cy - 1); -+ paint.drawPoint(cx - 0, cy - 2); - } - - if ((toDraw & Int21) != 0u) { -- paint.drawPoint(cx - 1, cy); -+ paint.drawPoint(cx - 2, cy - 1); - } - if ((toDraw & Int22) != 0u) { -- paint.drawPoint(cx, cy); -+ paint.drawPoint(cx - 1, cy - 1); - } - if ((toDraw & Int23) != 0u) { -- paint.drawPoint(cx + 1, cy); -+ paint.drawPoint(cx - 0, cy - 1); - } - - if ((toDraw & Int31) != 0u) { -- paint.drawPoint(cx - 1, cy + 1); -+ paint.drawPoint(cx - 2, cy); - } - if ((toDraw & Int32) != 0u) { -- paint.drawPoint(cx, cy + 1); -+ paint.drawPoint(cx - 1, cy); - } - if ((toDraw & Int33) != 0u) { -- paint.drawPoint(cx + 1, cy + 1); -+ paint.drawPoint(cx - 0, cy); - } - } - -@@ -705,7 +705,7 @@ static void drawOtherChar(QPainter& paint, int x, int y, int w, int h, uchar cod - { - //Calculate cell midpoints, end points. - const int cx = x + w / 2; -- const int cy = y + h / 2; -+ const int cy = y + h / 2. - 0.5; // Compensate for the translation, to match fonts - const int ex = x + w - 1; - const int ey = y + h - 1; - -@@ -792,16 +792,17 @@ void TerminalDisplay::drawLineCharString(QPainter& painter, int x, int y, const - const Character* attributes) - { - painter.save(); -- painter.setRenderHint(QPainter::Antialiasing); - -- const QPen& originalPen = painter.pen(); -+ // For antialiasing, we need to shift it so the single pixel width is in the middle -+ painter.translate(0.5, 0.5); - - if (((attributes->rendition & RE_BOLD) != 0) && _boldIntense) { -- QPen boldPen(originalPen); -- boldPen.setWidth(3); -+ QPen boldPen(painter.pen()); -+ boldPen.setWidth(4); - painter.setPen(boldPen); - } - -+ - for (int i = 0 ; i < str.length(); i++) { - const uchar code = str[i].cell(); - if (LineChars[code] != 0u) { -@@ -909,10 +910,10 @@ void TerminalDisplay::drawBackground(QPainter& painter, const QRect& rect, const - QColor color(backgroundColor); - color.setAlpha(qAlpha(_blendColor)); - -- painter.save(); -+ const QPainter::CompositionMode originalMode = painter.compositionMode(); - painter.setCompositionMode(QPainter::CompositionMode_Source); - painter.fillRect(rect, color); -- painter.restore(); -+ painter.setCompositionMode(originalMode); - #endif - } else { - painter.fillRect(rect, backgroundColor); -@@ -1041,8 +1042,6 @@ void TerminalDisplay::drawTextFragment(QPainter& painter , - const QString& text, - const Character* style) - { -- painter.save(); -- - // setup painter - const QColor foregroundColor = style->foregroundColor.color(_colorTable); - const QColor backgroundColor = style->backgroundColor.color(_colorTable); -@@ -1062,8 +1061,6 @@ void TerminalDisplay::drawTextFragment(QPainter& painter , - - // draw text - drawCharacters(painter, rect, text, style, invertCharacterColor); -- -- painter.restore(); - } - - void TerminalDisplay::drawPrinterFriendlyTextFragment(QPainter& painter, -@@ -1071,8 +1068,6 @@ void TerminalDisplay::drawPrinterFriendlyTextFragment(QPainter& painter, - 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; -@@ -1081,8 +1076,6 @@ void TerminalDisplay::drawPrinterFriendlyTextFragment(QPainter& painter, - - // draw text - drawCharacters(painter, rect, text, &print_style, false); -- -- painter.restore(); - } - - void TerminalDisplay::setRandomSeed(uint randomSeed) -@@ -1499,6 +1492,8 @@ void TerminalDisplay::paintEvent(QPaintEvent* pe) - drawBackground(paint, rect, getBackgroundColor(), true /* use opacity setting */); - } - -+ paint.setRenderHint(QPainter::Antialiasing, _antialiasText); -+ - foreach(const QRect & rect, dirtyImageRegion.rects()) { - drawContents(paint, rect); - } --- -cgit v1.1 |