public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/qqc2-desktop-style/files/, kde-frameworks/qqc2-desktop-style/
@ 2025-01-27 18:43 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2025-01-27 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     ba3225bd988d6f3ea815e8033a0c50ea79b78b62
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 18:16:28 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 18:42:34 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba3225bd

kde-frameworks/qqc2-desktop-style: drop 6.7.0-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/qqc2-desktop-style/Manifest         |  1 -
 ...tyle-6.7.0-use-qt-textrendering-w-highdpi.patch | 53 ----------------------
 .../qqc2-desktop-style-6.7.0-r1.ebuild             | 40 ----------------
 3 files changed, 94 deletions(-)

diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index e589efab838b..4024fdab3028 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,4 +1,3 @@
 DIST qqc2-desktop-style-5.116.1.tar.xz 73068 BLAKE2B 713b863a08785f8d8a3509aad938818881e71bc2b966d10d823a805733bf2a5382337b7966a5c11c005ddf99a5e9ef377d59658568fc8cdcbdd1c35be41e1b09 SHA512 80520c19717f9150b6b0e91f45e65ef967f7fbadaff5b1f6bdab526822706a361e0094ded93826ea9fb2dc3028f8cd076e03b2067dbfc1d43ff764bc5ae5facb
 DIST qqc2-desktop-style-6.10.0.tar.xz 88972 BLAKE2B 45bf37292339d96531c8fe7abda489e08582d661bfba52b40d5c194788b462444d73eb860d5cc7f500316197e8a1c4f3425f35fcf64884d85ec4dddf946f392a SHA512 0075ed93195623a20fe79ca34d5b87aa8e7de00d8afbc1294804f90eb0a861fc357be5343ef57910ff21b6b6872bc695dd94e5456f4921964e778caff641d7fd
-DIST qqc2-desktop-style-6.7.0.tar.xz 87720 BLAKE2B 10fe8d08c6a01e5a54206186d296229f860d3d102390f6b3e29a5a49a66e444f0991c3d613ef80d2daa101311f39d3dc9757fbcafae9cc4cd08b497b835d02c0 SHA512 4660ee29d33d6140284267ff2cfdf2721fd437f1d4cf953448ed6b1368a9e068c60eb324acf407a7c5a7eb229a3956161162a7033d03bff4341b42080bec9eac
 DIST qqc2-desktop-style-6.9.0.tar.xz 88324 BLAKE2B 8ce9ccbb2bbfbfe08ff6a9bb41a6548be102ed57e79f898154af5d5d7c4d897b95b90f4776467d45efe8fc872ae68cf961e7454d548fb8c21a55c02eb901c167 SHA512 057aa1448393f94dc39edbb3b45fda3d84fb5986a37c5c62ced56ebe08f29d905d28d4d25bcb484e8b264cbab395baf27387a9c62f9f84495d2038d8c0e7bd96

diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-6.7.0-use-qt-textrendering-w-highdpi.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-6.7.0-use-qt-textrendering-w-highdpi.patch
deleted file mode 100644
index 251e9d3728f6..000000000000
--- a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-6.7.0-use-qt-textrendering-w-highdpi.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From e82957f5e6fc72e446239e2ee5139b93d3ceac85 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Fri, 22 Nov 2024 21:57:01 +0000
-Subject: [PATCH] Use Qt text rendering when high DPI scaling
-
-It is known that native rendering performs badly with scaling and an
-existing workaround is in place.
-
-The current check does not work on Wayland that has per-window rather
-than per-screen scaling. Given Qt changes hinting preferences when any
-scaling is used anyway, we may as well commit to using the non-native
-rendering throughout.
-
-For QtQuick the Qt renderer is more performant, handles transformations
-better and avoids this issue. Given the results look basically
-identical, we can simplify the existing code.
-
-BUG: 479891
----
- .../plasmadesktoptheme.cpp                      | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp b/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
-index 51a3241f..fac0831f 100644
---- a/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
-+++ b/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
-@@ -50,14 +50,15 @@ public:
-         connect(qGuiApp, &QGuiApplication::fontDatabaseChanged, this, &StyleSingleton::notifyWatchersConfigurationChange);
-         qGuiApp->installEventFilter(this);
- 
--        // Use NativeTextRendering as the default text rendering type when the scale factor is an integer.
--        // NativeTextRendering is still distorted sometimes with fractional scale factors,
--        // despite https://bugreports.qt.io/browse/QTBUG-67007 being closed.
--        qreal devicePixelRatio = qGuiApp->devicePixelRatio();
--        QQuickWindow::TextRenderType defaultTextRenderType =
--            int(devicePixelRatio) == devicePixelRatio ? QQuickWindow::NativeTextRendering : QQuickWindow::QtTextRendering;
--        QQuickWindow::setTextRenderType(defaultTextRenderType);
--
-+        // NativeTextRendering is still distorted sometimes with fractional scale factors
-+        // Given Qt disables all hinting with native rendering when any scaling is used anyway
-+        // we can use Qt's rendering throughout
-+        // QTBUG-126577
-+        if (qApp->devicePixelRatio() == 1.0) {
-+            QQuickWindow::setTextRenderType(QQuickWindow::NativeTextRendering);
-+        } else {
-+            QQuickWindow::setTextRenderType(QQuickWindow::QtTextRendering);
-+        }
-         smallFont = loadSmallFont();
-     }
- 
--- 
-GitLab
-

diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.7.0-r1.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.7.0-r1.ebuild
deleted file mode 100644
index 0f7867d20a4c..000000000000
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.7.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=6.6.2
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ )"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-# Qt_6_PRIVATE_API matches org.kde.desktop.so, see also:
-# https://invent.kde.org/frameworks/qqc2-desktop-style/-/merge_requests/379
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6=
-	=kde-frameworks/kcolorscheme-${PVCUT}*:6
-	=kde-frameworks/kconfig-${PVCUT}*:6
-	=kde-frameworks/kiconthemes-${PVCUT}*:6
-	=kde-frameworks/kirigami-${PVCUT}*:6
-	=kde-frameworks/sonnet-${PVCUT}*:6[qml]
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qt5compat-${QTMIN}:6
-"
-BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
-
-PATCHES=(
-	"${FILESDIR}/${P}-use-qt-textrendering-w-highdpi.patch" # KDE-bug #479891
-)
-
-CMAKE_SKIP_TESTS=(
-	# bug 926509
-	animationspeedmodifiertest
-)


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/qqc2-desktop-style/files/, kde-frameworks/qqc2-desktop-style/
@ 2024-11-22 23:14 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-11-22 23:14 UTC (permalink / raw
  To: gentoo-commits

commit:     c5b3d781b1ae2869a602906d0df470616d9d39d5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 23:09:28 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 23:12:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5b3d781

kde-frameworks/qqc2-desktop-style: Qt text rendering w highDPI scaling

Upstream commit e82957f5e6fc72e446239e2ee5139b93d3ceac85

See also:
https://invent.kde.org/frameworks/qqc2-desktop-style/-/merge_requests/429

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=479891

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...tyle-6.7.0-use-qt-textrendering-w-highdpi.patch | 53 ++++++++++++++++++++++
 .../qqc2-desktop-style-6.7.0-r1.ebuild             | 40 ++++++++++++++++
 .../qqc2-desktop-style-6.8.0-r1.ebuild             | 40 ++++++++++++++++
 3 files changed, 133 insertions(+)

diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-6.7.0-use-qt-textrendering-w-highdpi.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-6.7.0-use-qt-textrendering-w-highdpi.patch
new file mode 100644
index 000000000000..251e9d3728f6
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-6.7.0-use-qt-textrendering-w-highdpi.patch
@@ -0,0 +1,53 @@
+From e82957f5e6fc72e446239e2ee5139b93d3ceac85 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Fri, 22 Nov 2024 21:57:01 +0000
+Subject: [PATCH] Use Qt text rendering when high DPI scaling
+
+It is known that native rendering performs badly with scaling and an
+existing workaround is in place.
+
+The current check does not work on Wayland that has per-window rather
+than per-screen scaling. Given Qt changes hinting preferences when any
+scaling is used anyway, we may as well commit to using the non-native
+rendering throughout.
+
+For QtQuick the Qt renderer is more performant, handles transformations
+better and avoids this issue. Given the results look basically
+identical, we can simplify the existing code.
+
+BUG: 479891
+---
+ .../plasmadesktoptheme.cpp                      | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp b/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
+index 51a3241f..fac0831f 100644
+--- a/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
++++ b/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
+@@ -50,14 +50,15 @@ public:
+         connect(qGuiApp, &QGuiApplication::fontDatabaseChanged, this, &StyleSingleton::notifyWatchersConfigurationChange);
+         qGuiApp->installEventFilter(this);
+ 
+-        // Use NativeTextRendering as the default text rendering type when the scale factor is an integer.
+-        // NativeTextRendering is still distorted sometimes with fractional scale factors,
+-        // despite https://bugreports.qt.io/browse/QTBUG-67007 being closed.
+-        qreal devicePixelRatio = qGuiApp->devicePixelRatio();
+-        QQuickWindow::TextRenderType defaultTextRenderType =
+-            int(devicePixelRatio) == devicePixelRatio ? QQuickWindow::NativeTextRendering : QQuickWindow::QtTextRendering;
+-        QQuickWindow::setTextRenderType(defaultTextRenderType);
+-
++        // NativeTextRendering is still distorted sometimes with fractional scale factors
++        // Given Qt disables all hinting with native rendering when any scaling is used anyway
++        // we can use Qt's rendering throughout
++        // QTBUG-126577
++        if (qApp->devicePixelRatio() == 1.0) {
++            QQuickWindow::setTextRenderType(QQuickWindow::NativeTextRendering);
++        } else {
++            QQuickWindow::setTextRenderType(QQuickWindow::QtTextRendering);
++        }
+         smallFont = loadSmallFont();
+     }
+ 
+-- 
+GitLab
+

diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.7.0-r1.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.7.0-r1.ebuild
new file mode 100644
index 000000000000..66285380137c
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.7.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ )"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# Qt_6_PRIVATE_API matches org.kde.desktop.so, see also:
+# https://invent.kde.org/frameworks/qqc2-desktop-style/-/merge_requests/379
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6=
+	=kde-frameworks/kcolorscheme-${PVCUT}*:6
+	=kde-frameworks/kconfig-${PVCUT}*:6
+	=kde-frameworks/kiconthemes-${PVCUT}*:6
+	=kde-frameworks/kirigami-${PVCUT}*:6
+	=kde-frameworks/sonnet-${PVCUT}*:6[qml]
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qt5compat-${QTMIN}:6
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+PATCHES=(
+	"${FILESDIR}/${P}-use-qt-textrendering-w-highdpi.patch" # KDE-bug #479891
+)
+
+CMAKE_SKIP_TESTS=(
+	# bug 926509
+	animationspeedmodifiertest
+)

diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.8.0-r1.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.8.0-r1.ebuild
new file mode 100644
index 000000000000..f63d2fa1dfd0
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.8.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ )"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# Qt_6_PRIVATE_API matches org.kde.desktop.so, see also:
+# https://invent.kde.org/frameworks/qqc2-desktop-style/-/merge_requests/379
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6=
+	=kde-frameworks/kcolorscheme-${PVCUT}*:6
+	=kde-frameworks/kconfig-${PVCUT}*:6
+	=kde-frameworks/kiconthemes-${PVCUT}*:6
+	=kde-frameworks/kirigami-${PVCUT}*:6
+	=kde-frameworks/sonnet-${PVCUT}*:6[qml]
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qt5compat-${QTMIN}:6
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.7.0-use-qt-textrendering-w-highdpi.patch" # KDE-bug #479891
+)
+
+CMAKE_SKIP_TESTS=(
+	# bug 926509
+	animationspeedmodifiertest
+)


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/qqc2-desktop-style/files/, kde-frameworks/qqc2-desktop-style/
@ 2022-07-26 12:08 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2022-07-26 12:08 UTC (permalink / raw
  To: gentoo-commits

commit:     c1b6912946d2a307fc754deca8f8266d29522af7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 23:04:33 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 12:04:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1b69129

kde-frameworks/qqc2-desktop-style: ProgressBar/Slider/ToolTip fixes

Upstream commits:
6a095ad15153479e22472628ddfe1bab1183d911
efb795efbe0579cb30cc042d61214c139c5fb110
299748e9bdc01a30e90cb7413b0815564864dc3b
939273025ed92246b5e6d1e3a944a8c88bbc682b

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=455339
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=456729
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=457079
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...p-style-5.96.0-drop-layout-direction-hack.patch | 27 +++++++++
 ...c2-desktop-style-5.96.0-fix-menubar-theme.patch | 31 ++++++++++
 .../qqc2-desktop-style-5.96.0-fix-precision.patch  | 70 ++++++++++++++++++++++
 ...-desktop-style-5.96.0-strip-out-apersands.patch | 47 +++++++++++++++
 .../qqc2-desktop-style-5.96.0-r1.ebuild            | 36 +++++++++++
 5 files changed, 211 insertions(+)

diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-drop-layout-direction-hack.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-drop-layout-direction-hack.patch
new file mode 100644
index 000000000000..6f31670f5a52
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-drop-layout-direction-hack.patch
@@ -0,0 +1,27 @@
+From 6a095ad15153479e22472628ddfe1bab1183d911 Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Sat, 4 Jun 2022 03:11:58 +0300
+Subject: [PATCH] ProgressBar: Drop layout direction hack
+
+It is not needed anymore: mirroring is now handled correctly in the
+Breeze theme implementation.
+---
+ org.kde.desktop/ProgressBar.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/org.kde.desktop/ProgressBar.qml b/org.kde.desktop/ProgressBar.qml
+index 23c1df3..2d075c7 100644
+--- a/org.kde.desktop/ProgressBar.qml
++++ b/org.kde.desktop/ProgressBar.qml
+@@ -26,7 +26,7 @@ T.ProgressBar {
+         control: controlRoot
+         maximum: indeterminate ? 0 : 10000 * controlRoot.to
+         minimum: indeterminate ? 0 : 10000 * controlRoot.from
+-        value: indeterminate ? 0 : 10000 * ((Qt.application.layoutDirection === Qt.LeftToRight ? controlRoot.visualPosition : 1 - controlRoot.visualPosition) * (controlRoot.to - controlRoot.from) + controlRoot.from)
++        value: indeterminate ? 0 : 10000 * controlRoot.value
+         horizontal: true
+         enabled: controlRoot.enabled
+ 
+-- 
+GitLab
+

diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-menubar-theme.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-menubar-theme.patch
new file mode 100644
index 000000000000..6cb908283ffc
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-menubar-theme.patch
@@ -0,0 +1,31 @@
+From 299748e9bdc01a30e90cb7413b0815564864dc3b Mon Sep 17 00:00:00 2001
+From: Kartikey Subramanium <kartikey@tutanota.com>
+Date: Wed, 20 Jul 2022 14:33:55 +0000
+Subject: [PATCH] Fix QQC2 MenuBar theme.
+
+BUG: 456729
+
+| Before | After |
+| ------ | ------ |
+| ![Screenshot_20220720_193546](/uploads/4eded8d26fe77b8a64d9abd7806ecf2f/Screenshot_20220720_193546.png) | ![Screenshot_20220720_193536](/uploads/825c2cc901d859ea5cd84fe299bdc941/Screenshot_20220720_193536.png) |
+---
+ org.kde.desktop/MenuBar.qml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/org.kde.desktop/MenuBar.qml b/org.kde.desktop/MenuBar.qml
+index f10b01a..68b92af 100644
+--- a/org.kde.desktop/MenuBar.qml
++++ b/org.kde.desktop/MenuBar.qml
+@@ -13,6 +13,9 @@ import org.kde.kirigami 2.4 as Kirigami
+ T.MenuBar {
+     id: controlRoot
+ 
++    Kirigami.Theme.colorSet: Kirigami.Theme.Header
++    Kirigami.Theme.inherit: false
++
+     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                             contentWidth + leftPadding + rightPadding)
+     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+-- 
+GitLab
+

diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-precision.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-precision.patch
new file mode 100644
index 000000000000..36705ce0c8b6
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-precision.patch
@@ -0,0 +1,70 @@
+From efb795efbe0579cb30cc042d61214c139c5fb110 Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Fri, 22 Jul 2022 20:31:48 +0300
+Subject: [PATCH] ProgressBar,Slider: Adapt great precision to the harsh
+ reality
+
+Test case: `to` values >= 214749 should work.
+
+BUG: 455339
+---
+ org.kde.desktop/ProgressBar.qml | 10 +++++++---
+ org.kde.desktop/Slider.qml      | 12 ++++++++----
+ 2 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/org.kde.desktop/ProgressBar.qml b/org.kde.desktop/ProgressBar.qml
+index 18d879b..77beb1b 100644
+--- a/org.kde.desktop/ProgressBar.qml
++++ b/org.kde.desktop/ProgressBar.qml
+@@ -22,11 +22,15 @@ T.ProgressBar {
+     contentItem: Item {}
+ 
+     background: StylePrivate.StyleItem {
++        // Rescale for extra precision. Adapts to the range of `from` & `to` to avoid integer overflow.
++        property int factor: (Math.abs(controlRoot.from) < 100000 && Math.abs(controlRoot.to) < 100000)
++            ? 10000 : 1
++
+         elementType: "progressbar"
+         control: controlRoot
+-        maximum: indeterminate ? 0 : 10000 * controlRoot.to
+-        minimum: indeterminate ? 0 : 10000 * controlRoot.from
+-        value: indeterminate ? 0 : 10000 * controlRoot.value
++        maximum: indeterminate ? 0 : factor * controlRoot.to
++        minimum: indeterminate ? 0 : factor * controlRoot.from
++        value: indeterminate ? 0 : factor * controlRoot.value
+         horizontal: true
+         enabled: controlRoot.enabled
+ 
+diff --git a/org.kde.desktop/Slider.qml b/org.kde.desktop/Slider.qml
+index 58bc99a..49b8ccb 100644
+--- a/org.kde.desktop/Slider.qml
++++ b/org.kde.desktop/Slider.qml
+@@ -28,6 +28,10 @@ T.Slider {
+     snapMode: T.Slider.SnapOnRelease
+ 
+     background: StylePrivate.StyleItem {
++        // Rescale for extra precision. Adapts to the range of `from` & `to` to avoid integer overflow.
++        property int factor: (Math.abs(controlRoot.from) < 100000 && Math.abs(controlRoot.to) < 100000)
++            ? 10000 : 1
++
+         control: controlRoot
+         elementType: "slider"
+         sunken: controlRoot.pressed
+@@ -36,10 +40,10 @@ T.Slider {
+         contentHeight: horizontal ? (Kirigami.Settings.tabletMode ? 24 : 22) : controlRoot.implicitHeight
+         anchors.verticalCenter: controlRoot.verticalCenter
+ 
+-        maximum: 10000 * controlRoot.to
+-        minimum: 10000 * controlRoot.from
+-        step: 10000 * controlRoot.stepSize
+-        value: 10000 * controlRoot.value
++        maximum: factor * controlRoot.to
++        minimum: factor * controlRoot.from
++        step: factor * controlRoot.stepSize
++        value: factor * controlRoot.value
+         horizontal: controlRoot.orientation === Qt.Horizontal
+         enabled: controlRoot.enabled
+         hasFocus: controlRoot.activeFocus
+-- 
+GitLab
+

diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-strip-out-apersands.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-strip-out-apersands.patch
new file mode 100644
index 000000000000..59bb60c6c347
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-strip-out-apersands.patch
@@ -0,0 +1,47 @@
+From 939273025ed92246b5e6d1e3a944a8c88bbc682b Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Fri, 22 Jul 2022 21:27:04 +0300
+Subject: [PATCH] ToolTip: Sync to PC3: Strip out ampersands
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Easily reproducible broken example: put a notes applet on a desktop,
+hover over its "Configure…" button (it should be fine so far), then
+right click it, press Escape (or otherwise close the context menu, and
+hover again: now the tooltip spells "&Configure…" because for some
+reason a mnemonic was added during this time.
+---
+ org.kde.desktop/ToolTip.qml | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/org.kde.desktop/ToolTip.qml b/org.kde.desktop/ToolTip.qml
+index 40dfcbd..3a03cc5 100644
+--- a/org.kde.desktop/ToolTip.qml
++++ b/org.kde.desktop/ToolTip.qml
+@@ -13,7 +13,7 @@ import QtQuick.Layouts 1.15
+ import org.kde.kirigami 2.12 as Kirigami
+ 
+ T.ToolTip {
+-    id: controlRoot
++    id: control
+ 
+     Kirigami.Theme.colorSet: Kirigami.Theme.Tooltip
+     Kirigami.Theme.inherit: false
+@@ -41,9 +41,11 @@ T.ToolTip {
+     closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent
+ 
+     contentItem: Controls.Label {
+-        text: controlRoot.text
++        // Strip out ampersands right before non-whitespace characters, i.e.
++        // those used to determine the alt key shortcut
++        text: control.text.replace(/&(?=\S)/g, "")
+         wrapMode: Text.WordWrap
+-        font: controlRoot.font
++        font: control.font
+         Kirigami.Theme.colorSet: Kirigami.Theme.Tooltip
+         color: Kirigami.Theme.textColor
+     }
+-- 
+GitLab
+

diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0-r1.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0-r1.ebuild
new file mode 100644
index 000000000000..4f8f1501b88f
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ )"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5=
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/sonnet-${PVCUT}*:5[qml]
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-menubar-theme.patch" # KDE-bug #456729
+	"${FILESDIR}/${P}-drop-layout-direction-hack.patch" # mirror fix in breeze 5.24.6-r1
+	"${FILESDIR}/${P}-fix-precision.patch" # KDE-bug #455339
+	"${FILESDIR}/${P}-strip-out-apersands.patch" # KDE-bug #457079
+)


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/qqc2-desktop-style/files/, kde-frameworks/qqc2-desktop-style/
@ 2022-01-20 13:26 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2022-01-20 13:26 UTC (permalink / raw
  To: gentoo-commits

commit:     b6b11acbe0aba20b6c8a1f4b774399c134783ebe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 11:50:38 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 13:24:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6b11acb

kde-frameworks/qqc2-desktop-style: Fix menu metrics to match QStyle

Upstream commit bc0ca29bd47ce45b30c66bd8743b6a48e20123d2
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=447289
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../qqc2-desktop-style-5.90.0-KDEBUG-447289.patch  | 63 ++++++++++++++++++++++
 .../qqc2-desktop-style-5.90.0-r1.ebuild            | 31 +++++++++++
 2 files changed, 94 insertions(+)

diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.90.0-KDEBUG-447289.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.90.0-KDEBUG-447289.patch
new file mode 100644
index 000000000000..69991acb5c75
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.90.0-KDEBUG-447289.patch
@@ -0,0 +1,63 @@
+From bc0ca29bd47ce45b30c66bd8743b6a48e20123d2 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Thu, 23 Dec 2021 12:11:28 -0700
+Subject: [PATCH] Use metrics from Breeze for menu items
+
+We can't read them dynamically right now, unfortunately. So the values
+are hardcoded.
+
+BUG: 447289
+FIXED-IN: 5.91
+---
+ org.kde.desktop/Menu.qml     | 3 +++
+ org.kde.desktop/MenuItem.qml | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/org.kde.desktop/Menu.qml b/org.kde.desktop/Menu.qml
+index adaf644..205c0b7 100644
+--- a/org.kde.desktop/Menu.qml
++++ b/org.kde.desktop/Menu.qml
+@@ -37,6 +37,9 @@ T.Menu {
+             }
+             return maxWidth;
+         }
++
++        spacing: 0 // Hardcoded to the Breeze theme value
++
+         interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false
+         clip: true
+         currentIndex: control.currentIndex || 0
+diff --git a/org.kde.desktop/MenuItem.qml b/org.kde.desktop/MenuItem.qml
+index d8a7cf0..f0c95e5 100644
+--- a/org.kde.desktop/MenuItem.qml
++++ b/org.kde.desktop/MenuItem.qml
+@@ -25,7 +25,7 @@ T.MenuItem {
+ 
+     Layout.fillWidth: true
+     padding: Kirigami.Units.smallSpacing
+-    verticalPadding: Math.floor(Kirigami.Units.smallSpacing * 1.5)
++    verticalPadding: 4 // Hardcoded to the Breeze theme value
+     hoverEnabled: !Kirigami.Settings.isMobile
+ 
+     Kirigami.MnemonicData.enabled: controlRoot.enabled && controlRoot.visible
+@@ -53,7 +53,7 @@ T.MenuItem {
+             visible: (controlRoot.ListView.view && controlRoot.ListView.view.hasIcons) || (controlRoot.icon != undefined && (controlRoot.icon.name.length > 0 || controlRoot.icon.source.length > 0))
+             source: controlRoot.icon ? (controlRoot.icon.name || controlRoot.icon.source) : ""
+             color: controlRoot.icon ? controlRoot.icon.color : "transparent"
+-            Layout.preferredHeight: Math.max(Kirigami.Units.iconSizes.roundedIconSize(label.height), Kirigami.Units.iconSizes.small)
++            Layout.preferredHeight: Kirigami.Units.iconSizes.small
+             Layout.preferredWidth: Layout.preferredHeight
+         }
+         Label {
+@@ -94,7 +94,7 @@ T.MenuItem {
+         x: controlRoot.mirrored ? controlRoot.padding : controlRoot.width - width - controlRoot.padding
+         y: controlRoot.topPadding + (controlRoot.availableHeight - height) / 2
+         source: controlRoot.mirrored ? "go-next-symbolic-rtl" : "go-next-symbolic"
+-        width: Math.max(Kirigami.Units.iconSizes.roundedIconSize(label.height), Kirigami.Units.iconSizes.small)
++        width: Kirigami.Units.iconSizes.small
+         height: width
+         visible: controlRoot.subMenu
+     }
+-- 
+GitLab
+

diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.90.0-r1.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.90.0-r1.ebuild
new file mode 100644
index 000000000000..0f870ace3d87
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.90.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5=
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/sonnet-${PVCUT}*:5[qml]
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-KDEBUG-447289.patch" )


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-01-27 18:44 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-27 18:43 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/qqc2-desktop-style/files/, kde-frameworks/qqc2-desktop-style/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-11-22 23:14 Andreas Sturmlechner
2022-07-26 12:08 Andreas Sturmlechner
2022-01-20 13:26 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox