From ae65ce3004a526aafb44e4c05bdb27b41c4ccf42 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 18 Nov 2020 17:18:43 +0100 Subject: [PATCH] Revert "Draw frame outline at the outer edge, not a pixel further inside" This reverts commit 7e678c344b3d931acafe495a1e19d23199aacca7 and the followup. A B +-----+ +-----+ C | | |XXXXX| +---+ | XXX | |X X| |XXX| | XCX | |X C X| |XCX| | XXX | |X X| |XXX| | | |XXXXX| +---+ +-----+ +-----+ Initially it was A, the referenced commit changed it to be B instead, which created a 1px gap between frame and content, and the followup avoids that gap by adjusting the frame width, resulting in C. Although it's consistent, it leads to a worse apperance in places where the 1px margin between frame and rect was expected. --- kstyle/breezehelper.cpp | 2 +- kstyle/breezemetrics.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kstyle/breezehelper.cpp b/kstyle/breezehelper.cpp index 249d5b63..d22e1bc2 100644 --- a/kstyle/breezehelper.cpp +++ b/kstyle/breezehelper.cpp @@ -520,7 +520,7 @@ namespace Breeze painter->setRenderHint( QPainter::Antialiasing ); - QRectF frameRect( rect ); + QRectF frameRect( rect.adjusted( 1, 1, -1, -1 ) ); qreal radius( frameRadius( PenWidth::NoPen, -1 ) ); // set pen diff --git a/kstyle/breezemetrics.h b/kstyle/breezemetrics.h index fcf8ab9a..742bd4b9 100644 --- a/kstyle/breezemetrics.h +++ b/kstyle/breezemetrics.h @@ -35,7 +35,7 @@ namespace Breeze struct Metrics { // frames - static constexpr int Frame_FrameWidth = 1; + static constexpr int Frame_FrameWidth = 2; static constexpr int Frame_FrameRadius = 3; // layout