diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
commit | 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch) | |
tree | b9791a06ab3284e27b568412c59316c66240c682 /kde-plasma/plasma-desktop/files | |
parent | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff) |
gentoo resync : 22.12.2021
Diffstat (limited to 'kde-plasma/plasma-desktop/files')
3 files changed, 214 insertions, 0 deletions
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch new file mode 100644 index 000000000000..d77187409738 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch @@ -0,0 +1,126 @@ +From 9f19af95e9699420b057b6ff7e99968faf8948a3 Mon Sep 17 00:00:00 2001 +From: David Edmundson <kde@davidedmundson.co.uk> +Date: Fri, 3 Dec 2021 16:34:40 +0000 +Subject: [PATCH] containments/panel: Fix initial sizing + +Timers for anything that affect layouts are universally wrong. + +Ultimately this breaks layouts internal usage of QQmlParserStatus. For +runtime changes layout internally most relayouting is buffered +internally till the polish event which is once per frame. + +Removing this makes startup faster, less glitchy and more declarative. + + +(cherry picked from commit b2fd1578a0063938a3eda8d8e41f14394b7635f7) +--- + containments/panel/contents/ui/main.qml | 34 ++++++------------------- + 1 file changed, 8 insertions(+), 26 deletions(-) + +diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml +index 0a5477476..9b5656acf 100644 +--- a/containments/panel/contents/ui/main.qml ++++ b/containments/panel/contents/ui/main.qml +@@ -154,14 +154,12 @@ function checkLastSpacer() { + + //BEGIN connections + Component.onCompleted: { +- currentLayout.isLayoutHorizontal = isHorizontal + LayoutManager.plasmoid = plasmoid; + LayoutManager.root = root; + LayoutManager.layout = currentLayout; + LayoutManager.lastSpacer = lastSpacer; + LayoutManager.marginHighlights = []; + LayoutManager.restore(); +- containmentSizeSyncTimer.restart(); + + plasmoid.action("configure").visible = Qt.binding(function() { + return !plasmoid.immutable; +@@ -200,7 +198,6 @@ function checkLastSpacer() { + event.accept(event.proposedAction); + root.fixedWidth = 0; + root.fixedHeight = 0; +- containmentSizeSyncTimer.restart(); + } + + +@@ -215,8 +212,6 @@ function checkLastSpacer() { + } + + Plasmoid.onUserConfiguringChanged: { +- containmentSizeSyncTimer.restart(); +- + if (plasmoid.immutable) { + if (dragOverlay) { + dragOverlay.destroy(); +@@ -245,11 +240,7 @@ function checkLastSpacer() { + } + } + +- Plasmoid.onFormFactorChanged: containmentSizeSyncTimer.restart(); +- Containment.onEditModeChanged: containmentSizeSyncTimer.restart(); +- + onToolBoxChanged: { +- containmentSizeSyncTimer.restart(); + if (startupTimer.running) { + startupTimer.restart(); + } +@@ -478,10 +469,16 @@ function checkLastSpacer() { + + GridLayout { + id: currentLayout +- property bool isLayoutHorizontal ++ readonly property bool isLayoutHorizontal: root.isHorizontal + rowSpacing: PlasmaCore.Units.smallSpacing + columnSpacing: PlasmaCore.Units.smallSpacing + ++ x: (isLayoutHorizontal && root.toolBox && Qt.application.layoutDirection === Qt.RightToLeft && plasmoid.editMode) ? root.toolBox.width : 0; ++ y: 0 ++ ++ width: root.width - (isLayoutHorizontal && root.toolBox && plasmoid.editMode ? root.toolBox.width : 0) ++ height: root.height - (!isLayoutHorizontal && root.toolBox && plasmoid.editMode ? root.toolBox.height : 0) ++ + Layout.preferredWidth: { + var width = 0; + for (var i = 0, length = currentLayout.children.length; i < length; ++i) { +@@ -505,36 +502,21 @@ function checkLastSpacer() { + rows: 1 + columns: 1 + //when horizontal layout top-to-bottom, this way it will obey our limit of one row and actually lay out left to right +- flow: isHorizontal ? GridLayout.TopToBottom : GridLayout.LeftToRight ++ flow: isLayoutHorizontal ? GridLayout.TopToBottom : GridLayout.LeftToRight + layoutDirection: Qt.application.layoutDirection + } + + onWidthChanged: { +- containmentSizeSyncTimer.restart() + if (startupTimer.running) { + startupTimer.restart(); + } + } + onHeightChanged: { +- containmentSizeSyncTimer.restart() + if (startupTimer.running) { + startupTimer.restart(); + } + } + +- Timer { +- id: containmentSizeSyncTimer +- interval: 150 +- onTriggered: { +- dndSpacer.parent = root; +- currentLayout.x = (isHorizontal && toolBox && Qt.application.layoutDirection === Qt.RightToLeft && plasmoid.editMode) ? toolBox.width : 0; +- currentLayout.y = 0 +- currentLayout.width = root.width - (isHorizontal && toolBox && plasmoid.editMode ? toolBox.width : 0) +- currentLayout.height = root.height - (!isHorizontal && toolBox && plasmoid.editMode ? toolBox.height : 0) +- currentLayout.isLayoutHorizontal = isHorizontal +- } +- } +- + //FIXME: I don't see other ways at the moment a way to see when the UI is REALLY ready + Timer { + id: startupTimer +-- +GitLab + diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch new file mode 100644 index 000000000000..1c9a2b79e31e --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch @@ -0,0 +1,53 @@ +From 2131daa05195a2b55f593acf3d323cf4c2a89936 Mon Sep 17 00:00:00 2001 +From: Nate Graham <nate@kde.org> +Date: Thu, 2 Dec 2021 20:13:46 -0700 +Subject: [PATCH] kcms/touchpad/applet: Make the popup close on click + +BUG: 445982 +FIXED-IN: 5.23.5 +(cherry picked from commit 4cb2de984ab79bc257af0135bf92ea7390d5617f) +--- + .../applet/qml/contents/ui/touchpad.qml | 23 +++++++++++-------- + 1 file changed, 13 insertions(+), 10 deletions(-) + +diff --git a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml +index 3f5eb722f..106859c3a 100644 +--- a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml ++++ b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml +@@ -56,20 +56,23 @@ Item { + connectedSources: dataSource.sources + } + +- Plasmoid.compactRepresentation: PlasmaCore.ToolTipArea { +- id: toolTip ++ Plasmoid.compactRepresentation: PlasmaCore.IconItem { ++ implicitWidth: PlasmaCore.Units.iconSizes.small ++ implicitHeight: PlasmaCore.Units.iconSizes.small + +- Layout.minimumWidth: PlasmaCore.Units.iconSizes.small +- Layout.minimumHeight: Layout.minimumWidth ++ source: plasmoid.icon ++ active: parent.containsMouse + +- mainText: plasmoid.title +- subText: plasmoid.toolTipSubText ++ PlasmaCore.ToolTipArea { ++ mainText: plasmoid.title ++ subText: plasmoid.toolTipSubText ++ } + +- PlasmaCore.IconItem { ++ MouseArea { + anchors.fill: parent +- source: plasmoid.icon +- active: parent.containsMouse +- enabled: root.hasTouchpad ++ onClicked: { ++ plasmoid.expanded = !plasmoid.expanded; ++ } + } + } + +-- +GitLab + diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch new file mode 100644 index 000000000000..07d741424005 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch @@ -0,0 +1,35 @@ +From aadab772fb81ff3d97c8b5342a8a018f51b2ef60 Mon Sep 17 00:00:00 2001 +From: Nate Graham <nate@kde.org> +Date: Fri, 3 Dec 2021 09:36:47 -0700 +Subject: [PATCH] kcms/touchpad/applet: Fix mousearea lookup + +(cherry picked from commit f4060c48b264a5054c2ffa795c208910d42bfd42) +--- + kcms/touchpad/applet/qml/contents/ui/touchpad.qml | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml +index 106859c3a..aa1034e59 100644 +--- a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml ++++ b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml +@@ -61,7 +61,7 @@ Item { + implicitHeight: PlasmaCore.Units.iconSizes.small + + source: plasmoid.icon +- active: parent.containsMouse ++ active: mousearea.containsMouse + + PlasmaCore.ToolTipArea { + mainText: plasmoid.title +@@ -69,6 +69,8 @@ Item { + } + + MouseArea { ++ id: mousearea ++ + anchors.fill: parent + onClicked: { + plasmoid.expanded = !plasmoid.expanded; +-- +GitLab + |