svn commit: r547276 - in head/x11-themes/kf5-qqc2-desktop-style: . files
Adriaan de Groot
adridg at FreeBSD.org
Tue Sep 1 15:04:29 UTC 2020
Author: adridg
Date: Tue Sep 1 15:04:28 2020
New Revision: 547276
URL: https://svnweb.freebsd.org/changeset/ports/547276
Log:
Backport theme-style fix for KDE qqc2-desktop-style
The theme was doing weird things which broke Musescore.
Upstream (except there's a whole forest of intertwined
bug reports) report https://bugs.kde.org/show_bug.cgi?id=425949
PR: 247466
Reported by: Keith White
Added:
head/x11-themes/kf5-qqc2-desktop-style/files/
head/x11-themes/kf5-qqc2-desktop-style/files/patch-git-1f0f210ad1d8286ba7a8254664489f922cbba0c3 (contents, props changed)
Modified:
head/x11-themes/kf5-qqc2-desktop-style/Makefile
Modified: head/x11-themes/kf5-qqc2-desktop-style/Makefile
==============================================================================
--- head/x11-themes/kf5-qqc2-desktop-style/Makefile Tue Sep 1 14:46:31 2020 (r547275)
+++ head/x11-themes/kf5-qqc2-desktop-style/Makefile Tue Sep 1 15:04:28 2020 (r547276)
@@ -2,6 +2,7 @@
PORTNAME= qqc2-desktop-style
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-themes kde kde-frameworks
MAINTAINER= kde at FreeBSD.org
Added: head/x11-themes/kf5-qqc2-desktop-style/files/patch-git-1f0f210ad1d8286ba7a8254664489f922cbba0c3
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-themes/kf5-qqc2-desktop-style/files/patch-git-1f0f210ad1d8286ba7a8254664489f922cbba0c3 Tue Sep 1 15:04:28 2020 (r547276)
@@ -0,0 +1,45 @@
+Git commit 1f0f210ad1d8286ba7a8254664489f922cbba0c3 by Noah Davis.
+Committed on 31/08/2020 at 12:46.
+Pushed by ndavis into branch 'master'.
+
+Don't use parent height/width for implicit ToolSeparator sizing
+
+I realized this was pretty much all wrong, so I rewrote the whole thing with a structure inspired by the Default QQC2 theme.
+
+Padding property was removed since it was originally added to give the
+separator back the padding that it lost by having the same height as the
+parent.
+
+diff --git org.kde.desktop/ToolSeparator.qml org.kde.desktop/ToolSeparator.qml
+index 197cd46..80d172f 100644
+--- org.kde.desktop/ToolSeparator.qml
++++ org.kde.desktop/ToolSeparator.qml
+@@ -12,20 +12,14 @@ import org.kde.kirigami 2.4 as Kirigami
+ T.ToolSeparator {
+ id: controlRoot
+
+- topPadding: 0
+- bottomPadding: 0
+- leftPadding: Kirigami.Units.smallSpacing
+- rightPadding: Kirigami.Units.smallSpacing
++ implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
++ implicitContentWidth + leftPadding + rightPadding)
++ implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
++ implicitContentHeight + topPadding + bottomPadding)
+
+- implicitWidth: separator.width + controlRoot.leftPadding + controlRoot.rightPadding
+- implicitHeight: parent.height
+-
+- background: Kirigami.Separator {
+- id: separator
+- anchors {
+- top: controlRoot.top
+- bottom: controlRoot.bottom
+- horizontalCenter: controlRoot.horizontalCenter
+- }
++ contentItem: Kirigami.Separator {
++ // implicitHeight is the same as ToolBar implicitHeight minus ToolBar padding if not horizontal
++ implicitHeight: horizontal ? Math.floor(Kirigami.Units.devicePixelRatio) : 40 - (Kirigami.Units.smallSpacing * 2)
++ implicitWidth: horizontal ? 40 - (Kirigami.Units.smallSpacing * 2) : Math.floor(Kirigami.Units.devicePixelRatio)
+ }
+ }
More information about the svn-ports-head
mailing list