Index: head/x11-themes/kf5-qqc2-desktop-style/Makefile =================================================================== --- head/x11-themes/kf5-qqc2-desktop-style/Makefile (revision 547275) +++ head/x11-themes/kf5-qqc2-desktop-style/Makefile (revision 547276) @@ -1,16 +1,17 @@ # $FreeBSD$ PORTNAME= qqc2-desktop-style DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= x11-themes kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= Qt QuickControl2 style for KDE USES= cmake compiler:c++11-lang kde:5 pkgconfig qt:5 tar:xz USE_KDE= auth codecs config configwidgets coreaddons ecm iconthemes \ kirigami2 widgetsaddons USE_QT= gui declarative network widgets xml \ buildtools_build core qmake_build .include Index: head/x11-themes/kf5-qqc2-desktop-style/files/patch-git-1f0f210ad1d8286ba7a8254664489f922cbba0c3 =================================================================== --- head/x11-themes/kf5-qqc2-desktop-style/files/patch-git-1f0f210ad1d8286ba7a8254664489f922cbba0c3 (nonexistent) +++ head/x11-themes/kf5-qqc2-desktop-style/files/patch-git-1f0f210ad1d8286ba7a8254664489f922cbba0c3 (revision 547276) @@ -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) + } + } Property changes on: head/x11-themes/kf5-qqc2-desktop-style/files/patch-git-1f0f210ad1d8286ba7a8254664489f922cbba0c3 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property