Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qqc2-desktop-style for openSUSE:Factory checked in at 2022-06-17 21:19:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old) and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style" Fri Jun 17 21:19:46 2022 rev:59 rq:982308 version:5.95.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes 2022-05-16 18:09:37.781331252 +0200 +++ /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.1548/qqc2-desktop-style.changes 2022-06-17 21:21:55.358754167 +0200 @@ -1,0 +2,31 @@ +Fri Jun 10 14:12:51 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.95.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.95.0 +- Changes since 5.94.0: + * Buttons: Press F to pay respects + * DelayButton: Fix invalid id references in transition/animation + * ProgressBar,Slider: Draw position smoothly with greater precision + * MenuItem: Remove redundant check + * Clean up whitespaces and JavaScript: Fix broken syntax + * Clean up whitespaces and JavaScript + * ProgressBar: Fix rendering of visual position when `from` is non-zero + * ProgressBar: Replace hardcoded redraw interval with frame-based animations + * RoundButton: Fix expression block may return nothing (undefined) + * ScrollView: Stop passing down `enabled` property to the ScrollBars explicitly + * ScrollView: Drop support for nullable ScrollBars + * ScrollView: Remove id from a scrollbar + * ScrollView: Fix aged comment + * ScrollView: Fix whitespace + * port away from Qt smart pointers where possible + * ComboBox: Use qualified ListView.view attached property in delegate + * ComboBox: Remove workaround for `editable` property from Qt 5.7 times + * ComboBox: Use rect type for rect property + * proper fix for the previous commit + * Fix overlapping scrollbar (kde#453958) + * Relayout the scrollbar when non interactive + * Remove code that was only used with Qt <5.8 + +------------------------------------------------------------------- Old: ---- qqc2-desktop-style-5.94.0.tar.xz qqc2-desktop-style-5.94.0.tar.xz.sig New: ---- qqc2-desktop-style-5.95.0.tar.xz qqc2-desktop-style-5.95.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qqc2-desktop-style.spec ++++++ --- /var/tmp/diff_new_pack.aSE5n1/_old 2022-06-17 21:21:55.858754438 +0200 +++ /var/tmp/diff_new_pack.aSE5n1/_new 2022-06-17 21:21:55.862754440 +0200 @@ -16,11 +16,11 @@ # -%define _tar_path 5.94 +%define _tar_path 5.95 # Only needed for the package signature condition %bcond_without released Name: qqc2-desktop-style -Version: 5.94.0 +Version: 5.95.0 Release: 0 Summary: A Qt Quick Controls 2 Style for Desktop UIs License: GPL-2.0-or-later ++++++ qqc2-desktop-style-5.94.0.tar.xz -> qqc2-desktop-style-5.95.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/CMakeLists.txt new/qqc2-desktop-style-5.95.0/CMakeLists.txt --- old/qqc2-desktop-style-5.94.0/CMakeLists.txt 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/CMakeLists.txt 2022-06-04 15:50:27.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.94.0") # handled by release scripts -set(KF_DEP_VERSION "5.93.0") # handled by release scripts +set(KF_VERSION "5.95.0") # handled by release scripts +set(KF_DEP_VERSION "5.95.0") # handled by release scripts project(qqc2-desktop-style VERSION ${KF_VERSION}) @@ -21,7 +21,7 @@ ################# set KDE specific information ################# -find_package(ECM 5.93.0 REQUIRED NO_MODULE) +find_package(ECM 5.95.0 REQUIRED NO_MODULE) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp new/qqc2-desktop-style-5.95.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp --- old/qqc2-desktop-style-5.94.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp 2022-06-04 15:50:27.000000000 +0200 @@ -180,7 +180,8 @@ private: QHash<QPair<Kirigami::PlatformTheme::ColorSet, QPalette::ColorGroup>, Colors> m_cache; }; -Q_GLOBAL_STATIC_WITH_ARGS(QScopedPointer<StyleSingleton>, s_style, (new StyleSingleton)) + +Q_GLOBAL_STATIC(StyleSingleton, s_style); PlasmaDesktopTheme::PlasmaDesktopTheme(QObject *parent) : PlatformTheme(parent) @@ -194,10 +195,10 @@ connect(parentItem, &QQuickItem::windowChanged, this, &PlasmaDesktopTheme::syncWindow); } - (*s_style)->watchers.append(this); + s_style->watchers.append(this); setDefaultFont(qGuiApp->font()); - setSmallFont((*s_style)->smallFont); + setSmallFont(s_style->smallFont); syncWindow(); if (!m_window) { @@ -207,7 +208,7 @@ PlasmaDesktopTheme::~PlasmaDesktopTheme() { - (*s_style)->watchers.removeOne(this); + s_style->watchers.removeOne(this); } void PlasmaDesktopTheme::syncWindow() @@ -268,7 +269,7 @@ } } - const auto colors = (*s_style)->loadColors(colorSet(), group); + const auto colors = s_style->loadColors(colorSet(), group); // foreground setTextColor(colors.scheme.foreground(KColorScheme::NormalText).color()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/Button.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/Button.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/Button.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/Button.qml 2022-06-04 15:50:27.000000000 +0200 @@ -42,7 +42,7 @@ hover: controlRoot.hovered text: controlRoot.Kirigami.MnemonicData.mnemonicLabel hasFocus: controlRoot.activeFocus || controlRoot.highlighted - activeControl: controlRoot.Accessible.defaultButton ? "default" : "f" + activeControl: controlRoot.Accessible.defaultButton ? "default" : "" properties: { "icon": controlRoot.icon && controlRoot.display !== T.AbstractButton.TextOnly ? (controlRoot.icon.name || controlRoot.icon.source) : "", "iconColor": controlRoot.icon && controlRoot.icon.color.a > 0? controlRoot.icon.color : Kirigami.Theme.textColor, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/CheckBox.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/CheckBox.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/CheckBox.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/CheckBox.qml 2022-06-04 15:50:27.000000000 +0200 @@ -64,9 +64,9 @@ control: controlRoot anchors { - leftMargin: (controlRoot.mirrored ? parent.rightPadding : parent.leftPadding ) - Kirigami.Units.smallSpacing / 2 - left: parent.left + leftMargin: (controlRoot.mirrored ? parent.rightPadding : parent.leftPadding) - Kirigami.Units.smallSpacing / 2 top: parent.top + left: parent.left bottom: parent.bottom topMargin: parent.topPadding - 1 bottomMargin: parent.bottomPadding - 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/CheckDelegate.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/CheckDelegate.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/CheckDelegate.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/CheckDelegate.qml 2022-06-04 15:50:27.000000000 +0200 @@ -24,10 +24,9 @@ padding: Kirigami.Settings.tabletMode ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing - leftPadding: padding*2 topPadding: padding - - rightPadding: padding*2 + leftPadding: padding * 2 + rightPadding: padding * 2 bottomPadding: padding contentItem: Label { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/ComboBox.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/ComboBox.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/ComboBox.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/ComboBox.qml 2022-06-04 15:50:27.000000000 +0200 @@ -17,8 +17,8 @@ T.ComboBox { id: controlRoot - //NOTE: typeof necessary to not have warnings on Qt 5.7 - Kirigami.Theme.colorSet: typeof(editable) != "undefined" && editable ? Kirigami.Theme.View : Kirigami.Theme.Button + + Kirigami.Theme.colorSet: editable ? Kirigami.Theme.View : Kirigami.Theme.Button Kirigami.Theme.inherit: false implicitWidth: background.implicitWidth @@ -29,11 +29,11 @@ wheelEnabled: true padding: 5 - leftPadding: controlRoot.editable && controlRoot.mirrored ? 24 : padding - rightPadding: controlRoot.editable && !controlRoot.mirrored ? 24 : padding + leftPadding: editable && mirrored ? 24 : padding + rightPadding: editable && !mirrored ? 24 : padding delegate: ItemDelegate { - width: listView.width + width: ListView.view.width text: controlRoot.textRole ? (Array.isArray(controlRoot.model) ? modelData[controlRoot.textRole] : model[controlRoot.textRole]) : modelData highlighted: controlRoot.highlightedIndex == index property bool separatorVisible: false @@ -65,7 +65,7 @@ autoScroll: controlRoot.editable readOnly: controlRoot.down - visible: typeof(controlRoot.editable) != "undefined" && controlRoot.editable + visible: controlRoot.editable inputMethodHints: controlRoot.inputMethodHints validator: controlRoot.validator @@ -113,7 +113,7 @@ Private.MobileCursor { target: controlRoot.contentItem selectionStartHandle: true - property var rect: target.positionToRectangle(target.selectionStart) + readonly property rect rect: target.positionToRectangle(target.selectionStart) x: rect.x + 5 y: rect.y + 6 } @@ -131,7 +131,7 @@ contentHeight: Math.max(Math.ceil(textHeight("")), 14) + 2 text: controlRoot.displayText properties: { - "editable" : control.editable + "editable": control.editable } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/Control.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/Control.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/Control.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/Control.qml 2022-06-04 15:50:27.000000000 +0200 @@ -19,8 +19,8 @@ implicitHeight: Math.max(background ? background.implicitHeight : 0, (contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding) - leftPadding: styleItem.pixelMetric("layoutleftmargin") topPadding: styleItem.pixelMetric("layouttopmargin") + leftPadding: styleItem.pixelMetric("layoutleftmargin") rightPadding: styleItem.pixelMetric("layoutrightmargin") bottomPadding: styleItem.pixelMetric("layoutbottommargin") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/DelayButton.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/DelayButton.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/DelayButton.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/DelayButton.qml 2022-06-04 15:50:27.000000000 +0200 @@ -23,7 +23,7 @@ transition: Transition { NumberAnimation { - duration: control.delay * (control.pressed ? 1.0 - control.progress : 0.3 * control.progress) + duration: controlRoot.delay * (controlRoot.pressed ? 1.0 - controlRoot.progress : 0.3 * controlRoot.progress) } } @@ -36,13 +36,13 @@ hover: controlRoot.hovered text: controlRoot.text hasFocus: controlRoot.activeFocus - activeControl: controlRoot.isDefault ? "default" : "f" + activeControl: controlRoot.Accessible.defaultButton ? "default" : "" StylePrivate.StyleItem { anchors { - bottom: parent.bottom left: parent.left right: parent.right + bottom: parent.bottom margins: 3 } elementType: "progressbar" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/Dial.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/Dial.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/Dial.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/Dial.qml 2022-06-04 15:50:27.000000000 +0200 @@ -24,10 +24,10 @@ elementType: "dial" horizontal: false - maximum: controlRoot.to*100 - minimum: controlRoot.from*100 - step: controlRoot.stepSize*100 - value: controlRoot.value*100 + maximum: controlRoot.to * 100 + minimum: controlRoot.from * 100 + step: controlRoot.stepSize * 100 + value: controlRoot.value * 100 hasFocus: controlRoot.activeFocus hover: controlRoot.hovered diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/DialogButtonBox.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/DialogButtonBox.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/DialogButtonBox.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/DialogButtonBox.qml 2022-06-04 15:50:27.000000000 +0200 @@ -28,7 +28,7 @@ implicitWidth, // Divide availableWidth (width - leftPadding - rightPadding) by the number of buttons, // then subtract the spacing between each button. - (control.availableWidth / control.count) - (control.spacing * (control.count-1)) + (control.availableWidth / control.count) - (control.spacing * (control.count - 1)) )) Kirigami.MnemonicData.controlType: Kirigami.MnemonicData.DialogButton } @@ -55,7 +55,7 @@ function setStandardIcon(buttonType, iconName) { let button = standardButton(buttonType) // For some reason, `== ""` works, but `=== ""` and `!name && !source` doesn't. - if (button && button.icon.name == "" && button.icon.source == "") { + if (button && button.icon.name == "" && button.icon.source == "") { button.icon.name = iconName } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/Drawer.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/Drawer.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/Drawer.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/Drawer.qml 2022-06-04 15:50:27.000000000 +0200 @@ -32,9 +32,9 @@ Rectangle { readonly property bool horizontal: control.edge === Qt.LeftEdge || control.edge === Qt.RightEdge anchors { + top: control.edge !== Qt.TopEdge ? parent.top : undefined left: control.edge !== Qt.LeftEdge ? parent.left : undefined right: control.edge !== Qt.RightEdge ? parent.right : undefined - top: control.edge !== Qt.TopEdge ? parent.top : undefined bottom: control.edge !== Qt.BottomEdge ? parent.bottom : undefined } color: Kirigami.Theme.textColor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/ItemDelegate.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/ItemDelegate.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/ItemDelegate.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/ItemDelegate.qml 2022-06-04 15:50:27.000000000 +0200 @@ -17,15 +17,14 @@ implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding implicitHeight: Math.max(contentItem.implicitHeight, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding hoverEnabled: true padding: Kirigami.Settings.tabletMode ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing - leftPadding: padding*2 topPadding: padding - - rightPadding: padding*2 + leftPadding: padding * 2 + rightPadding: padding * 2 bottomPadding: padding contentItem: RowLayout { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/Menu.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/Menu.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/Menu.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/Menu.qml 2022-06-04 15:50:27.000000000 +0200 @@ -38,8 +38,8 @@ model: control.contentModel implicitWidth: { - var maxWidth = 0; - for (var i = 0; i < contentItem.children.length; ++i) { + let maxWidth = 0; + for (let i = 0; i < contentItem.children.length; ++i) { maxWidth = Math.max(maxWidth, contentItem.children[i].implicitWidth); } return maxWidth; @@ -59,9 +59,9 @@ Connections { target: control.contentItem.currentItem function onHoveredChanged() { - let currentItem = control.contentItem.currentItem - if (currentItem instanceof T.MenuItem && currentItem.highlighted - && !currentItem.subMenu && !currentItem.hovered) { + const item = control.contentItem.currentItem; + if (item instanceof T.MenuItem && item.highlighted + && !item.subMenu && !item.hovered) { control.currentIndex = -1 } } @@ -72,8 +72,8 @@ target: control.contentItem.contentItem function onChildrenChanged() { - for (var i in control.contentItem.contentItem.children) { - var child = control.contentItem.contentItem.children[i]; + for (let i in control.contentItem.contentItem.children) { + const child = control.contentItem.contentItem.children[i]; if (child.checkable && child.visible) { control.contentItem.hasCheckables = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/MenuBar.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/MenuBar.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/MenuBar.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/MenuBar.qml 2022-06-04 15:50:27.000000000 +0200 @@ -18,8 +18,7 @@ implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, contentHeight + topPadding + bottomPadding) - delegate: MenuBarItem { - } + delegate: MenuBarItem {} contentItem: Row { spacing: controlRoot.spacing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/MenuBarItem.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/MenuBarItem.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/MenuBarItem.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/MenuBarItem.qml 2022-06-04 15:50:27.000000000 +0200 @@ -18,9 +18,9 @@ implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding baselineOffset: contentItem.y + contentItem.baselineOffset + topPadding: Kirigami.Units.smallSpacing leftPadding: Kirigami.Units.largeSpacing rightPadding: Kirigami.Units.largeSpacing - topPadding: Kirigami.Units.smallSpacing bottomPadding: Kirigami.Units.smallSpacing hoverEnabled: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/MenuItem.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/MenuItem.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/MenuItem.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/MenuItem.qml 2022-06-04 15:50:27.000000000 +0200 @@ -72,13 +72,13 @@ Label { id: shortcut Layout.alignment: Qt.AlignVCenter - visible: controlRoot.action && controlRoot.action.hasOwnProperty("shortcut") && controlRoot.action.shortcut !== undefined - + visible: controlRoot.action && controlRoot.action.shortcut !== undefined + Shortcut { id: itemShortcut sequence: (shortcut.visible && controlRoot.action !== null) ? controlRoot.action.shortcut : "" } - + text: visible ? itemShortcut.nativeText : "" font: controlRoot.font color: label.color diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/MenuSeparator.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/MenuSeparator.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/MenuSeparator.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/MenuSeparator.qml 2022-06-04 15:50:27.000000000 +0200 @@ -13,13 +13,16 @@ T.MenuSeparator { id: controlRoot + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, implicitContentWidth + leftPadding + rightPadding) implicitHeight: visible ? Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) : 0 - verticalPadding: Math.round(Kirigami.Units.smallSpacing/2) + + verticalPadding: Math.round(Kirigami.Units.smallSpacing / 2) hoverEnabled: false focusPolicy: Qt.NoFocus + contentItem: Kirigami.Separator { // same as MenuItem background implicitWidth: Kirigami.Units.gridUnit * 8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/Popup.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/Popup.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/Popup.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/Popup.qml 2022-06-04 15:50:27.000000000 +0200 @@ -44,7 +44,7 @@ } } - contentItem: Item { } + contentItem: Item {} background: Kirigami.ShadowedRectangle { radius: 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/ProgressBar.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/ProgressBar.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/ProgressBar.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/ProgressBar.qml 2022-06-04 15:50:27.000000000 +0200 @@ -24,16 +24,21 @@ background: StylePrivate.StyleItem { elementType: "progressbar" control: controlRoot - maximum: indeterminate ? 0 : controlRoot.to*100 - minimum: indeterminate ? 0 : controlRoot.from*100 - value: indeterminate ? 0 : ((Qt.application.layoutDirection === Qt.LeftToRight ? controlRoot.visualPosition : 1 - controlRoot.visualPosition)*controlRoot.to*100) + 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) horizontal: true enabled: controlRoot.enabled - Timer { - interval: 50 + + // ScriptAction refuses to run on its own. So we add a NumberAnimation + // with non-zero duration to make it tied to a monitor refresh rate. + // See git history for more (e.g. why not PauseAnimation) + SequentialAnimation { running: controlRoot.indeterminate - repeat: true - onTriggered: parent.updateItem(); + loops: Animation.Infinite + + NumberAnimation { duration: 1 } + ScriptAction { script: controlRoot.background.updateItem() } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/RadioButton.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/RadioButton.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/RadioButton.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/RadioButton.qml 2022-06-04 15:50:27.000000000 +0200 @@ -64,11 +64,11 @@ control: controlRoot anchors { - leftMargin: (controlRoot.mirrored ? parent.rightPadding : parent.leftPadding ) - Kirigami.Units.smallSpacing / 2 - left: parent.left top: parent.top + left: parent.left bottom: parent.bottom topMargin: parent.topPadding - 1 + leftMargin: (controlRoot.mirrored ? parent.rightPadding : parent.leftPadding) - Kirigami.Units.smallSpacing / 2 bottomMargin: parent.bottomPadding - 1 } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/RadioDelegate.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/RadioDelegate.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/RadioDelegate.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/RadioDelegate.qml 2022-06-04 15:50:27.000000000 +0200 @@ -16,15 +16,14 @@ implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding implicitHeight: Math.max(contentItem.implicitHeight, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding hoverEnabled: true padding: Kirigami.Settings.tabletMode ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing - leftPadding: padding*2 topPadding: padding - - rightPadding: padding*2 + leftPadding: padding * 2 + rightPadding: padding * 2 bottomPadding: padding contentItem: Label { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/RangeSlider.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/RangeSlider.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/RangeSlider.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/RangeSlider.qml 2022-06-04 15:50:27.000000000 +0200 @@ -71,7 +71,7 @@ implicitHeight: horizontal ? 6 : 200 width: horizontal ? control.availableWidth : implicitWidth height: horizontal ? implicitHeight : control.availableHeight - radius: Math.round(Math.min(width/2, height/2)) + radius: Math.round(Math.min(width / 2, height / 2)) property color bgColor: Kirigami.Theme.textColor color: Qt.rgba(bgColor.r, bgColor.g, bgColor.b, 0.3) anchors.centerIn: parent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/RoundButton.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/RoundButton.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/RoundButton.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/RoundButton.qml 2022-06-04 15:50:27.000000000 +0200 @@ -40,41 +40,39 @@ contentItem: GridLayout { rowSpacing: controlRoot.spacing columnSpacing: controlRoot.spacing - flow: iconContent.visible && labelContent.visible && controlRoot.display == T.AbstractButton.TextUnderIcon ? GridLayout.TopToBottom : GridLayout.LeftToRight + flow: iconContent.visible && labelContent.visible && controlRoot.display === T.AbstractButton.TextUnderIcon ? GridLayout.TopToBottom : GridLayout.LeftToRight Kirigami.Icon { id: iconContent Layout.alignment: { if (iconContent.visible && labelContent.visible) { - if (controlRoot.display == T.AbstractButton.TextBesideIcon) { + if (controlRoot.display === T.AbstractButton.TextBesideIcon) { return Qt.AlignRight | Qt.AlignVCenter - } else if (controlRoot.display == T.AbstractButton.TextUnderIcon) { + } else if (controlRoot.display === T.AbstractButton.TextUnderIcon) { return Qt.AlignHCenter | Qt.AlignBottom } - } else { - return Qt.AlignCenter } + return Qt.AlignCenter } color: controlRoot.icon.color // defaults to Qt::transparent implicitWidth: controlRoot.icon.width implicitHeight: controlRoot.icon.height - visible: source.length > 0 && controlRoot.display != T.AbstractButton.TextOnly + visible: source.length > 0 && controlRoot.display !== T.AbstractButton.TextOnly source: controlRoot.icon ? (controlRoot.icon.name || controlRoot.icon.source) : "" } Controls.Label { id: labelContent Layout.alignment: { if (iconContent.visible && labelContent.visible) { - if (controlRoot.display == T.AbstractButton.TextBesideIcon) { + if (controlRoot.display === T.AbstractButton.TextBesideIcon) { return Qt.AlignLeft | Qt.AlignVCenter - } else if (controlRoot.display == T.AbstractButton.TextUnderIcon) { + } else if (controlRoot.display === T.AbstractButton.TextUnderIcon) { return Qt.AlignHCenter | Qt.AlignTop } - } else { - return Qt.AlignCenter } + return Qt.AlignCenter } text: controlRoot.text - visible: text.length > 0 && controlRoot.display != T.AbstractButton.IconOnly + visible: text.length > 0 && controlRoot.display !== T.AbstractButton.IconOnly } } background: Rectangle { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/ScrollBar.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/ScrollBar.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/ScrollBar.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/ScrollBar.qml 2022-06-04 15:50:27.000000000 +0200 @@ -24,9 +24,9 @@ interactive: !Kirigami.Settings.hasTransientTouchInput topPadding: style.topScrollbarPadding - bottomPadding: style.bottomScrollbarPadding leftPadding: style.leftScrollbarPadding rightPadding: style.rightScrollbarPadding + bottomPadding: style.bottomScrollbarPadding onPositionChanged: { disappearTimer.restart(); @@ -40,17 +40,16 @@ id: handleGraphics property real handleState: 0 - x: Math.round(controlRoot.orientation == Qt.Vertical + x: Math.round(controlRoot.orientation === Qt.Vertical ? (Qt.application.layoutDirection === Qt.LeftToRight ? (parent.width - width) - (parent.width/2 - width/2) * handleState : (parent.width/2 - width/2) * handleState) : 0) - y: Math.round(controlRoot.orientation == Qt.Horizontal + y: Math.round(controlRoot.orientation === Qt.Horizontal ? (parent.height - height) - (parent.height/2 - height/2) * handleState : 0) - NumberAnimation { id: resetAnim target: handleGraphics @@ -61,10 +60,10 @@ easing.type: Easing.InOutQuad } - width: Math.round(controlRoot.orientation == Qt.Vertical + width: Math.round(controlRoot.orientation === Qt.Vertical ? Math.max(2, Kirigami.Units.smallSpacing * handleState) : parent.width) - height: Math.round(controlRoot.orientation == Qt.Horizontal + height: Math.round(controlRoot.orientation === Qt.Horizontal ? Math.max(2, Kirigami.Units.smallSpacing * handleState) : parent.height) radius: Math.min(width, height) @@ -90,50 +89,50 @@ acceptedButtons: Qt.LeftButton | Qt.MiddleButton onExited: style.activeControl = "groove"; onPressed: { - var jump_position = Math.min(1 - controlRoot.size, Math.max(0, mouse.y/(controlRoot.orientation == Qt.Vertical ? height: width) - controlRoot.size/2)); + const jump_position = Math.min(1 - controlRoot.size, Math.max(0, mouse.y / (controlRoot.orientation === Qt.Vertical ? height : width) - controlRoot.size / 2)); if (mouse.buttons & Qt.MiddleButton) { style.activeControl = "handle"; controlRoot.position = jump_position; mouse.accepted = true; - } else if (style.activeControl == "down") { + } else if (style.activeControl === "down") { buttonTimer.increment = 1; buttonTimer.running = true; - mouse.accepted = true - } else if (style.activeControl == "up") { + mouse.accepted = true; + } else if (style.activeControl === "up") { buttonTimer.increment = -1; buttonTimer.running = true; - mouse.accepted = true - } else if (style.activeControl == "downPage") { + mouse.accepted = true; + } else if (style.activeControl === "downPage") { if (style.styleHint("scrollToClickPosition")) { controlRoot.position = jump_position; } else { buttonTimer.increment = controlRoot.size; buttonTimer.running = true; } - mouse.accepted = true - } else if (style.activeControl == "upPage") { + mouse.accepted = true; + } else if (style.activeControl === "upPage") { if (style.styleHint("scrollToClickPosition")) { controlRoot.position = jump_position; } else { buttonTimer.increment = -controlRoot.size; buttonTimer.running = true; } - mouse.accepted = true + mouse.accepted = true; } else { - mouse.accepted = false + mouse.accepted = false; } } onPositionChanged: { style.activeControl = style.hitTest(mouse.x, mouse.y) if (mouse.buttons & Qt.MiddleButton) { style.activeControl = "handle"; - controlRoot.position = Math.min(1 - controlRoot.size, Math.max(0, mouse.y/style.length - controlRoot.size/2)); + controlRoot.position = Math.min(1 - controlRoot.size, Math.max(0, mouse.y / style.length - controlRoot.size / 2)); mouse.accepted = true; } } onReleased: { buttonTimer.running = false; - mouse.accepted = false + mouse.accepted = false; } onCanceled: buttonTimer.running = false; @@ -143,7 +142,7 @@ StylePrivate.StyleItem { id: style - readonly property real length: (controlRoot.orientation == Qt.Vertical ? height : width) + readonly property real length: (controlRoot.orientation === Qt.Vertical ? height : width) property rect grooveRect: Qt.rect(0, 0, 0, 0) readonly property real topScrollbarPadding: grooveRect.top readonly property real bottomScrollbarPadding: style.height - grooveRect.bottom @@ -161,13 +160,13 @@ control: controlRoot anchors.fill: parent elementType: "scrollbar" - hover: activeControl != "none" + hover: activeControl !== "none" activeControl: "none" sunken: controlRoot.pressed minimum: 0 - maximum: style.length/controlRoot.size - style.length - value: controlRoot.position * (style.length/controlRoot.size) - horizontal: controlRoot.orientation == Qt.Horizontal + maximum: style.length / controlRoot.size - style.length + value: controlRoot.position * (style.length / controlRoot.size) + horizontal: controlRoot.orientation === Qt.Horizontal enabled: controlRoot.enabled visible: controlRoot.size < 1.0 @@ -180,9 +179,9 @@ interval: 150 triggeredOnStart: true onTriggered: { - if (increment == 1) { + if (increment === 1) { controlRoot.increase(); - } else if (increment == -1) { + } else if (increment === -1) { controlRoot.decrease(); } else { controlRoot.position = Math.min(1 - controlRoot.size, Math.max(0, controlRoot.position + increment)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/ScrollView.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/ScrollView.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/ScrollView.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/ScrollView.qml 2022-06-04 15:50:27.000000000 +0200 @@ -24,9 +24,9 @@ Kirigami.Theme.inherit: !background || !background.visible //size in pixel to accommodate the border drawn by qstyle + topPadding: internal.backgroundVisible && background.hasOwnProperty("topPadding") ? background.topPadding : 0 leftPadding: (internal.backgroundVisible && background.hasOwnProperty("leftPadding") ? background.leftPadding : 0) + (LayoutMirroring.enabled ? internal.verticalScrollBarWidth : 0) - topPadding: internal.backgroundVisible && background.hasOwnProperty("topPadding") ? background.topPadding : 0 rightPadding: (internal.backgroundVisible && background.hasOwnProperty("rightPadding") ? background.rightPadding : 0) + (!LayoutMirroring.enabled ? internal.verticalScrollBarWidth : 0) bottomPadding: (internal.backgroundVisible && background.hasOwnProperty("bottomPadding") ? background.bottomPadding : 0) @@ -43,11 +43,11 @@ Kirigami.WheelHandler { target: controlRoot.contentItem }, - /*create a background only after Component.onCompleted because: - * implementations can set their own background in a declarative way - * ScrollView {background.visible: true} must *not* work, because all upstream styles don't have a background so applications using this would break with other styles - * This is child of scrollHelper as it would break native scrollview finding of the flickable if it was a direct child - */ + // create a background only after Component.onCompleted because: + // implementations can set their own background in a declarative way. + // ScrollView {background.visible: true} must *not* work, because all + // upstream styles don't have a background so applications using this + // would break with other styles. Component { id: backgroundComponent StylePrivate.StyleItem { @@ -78,29 +78,28 @@ id: internal readonly property bool backgroundVisible: controlRoot.background && controlRoot.background.visible - readonly property real verticalScrollBarWidth: controlRoot.ScrollBar.vertical.visible && !Kirigami.Settings.tabletMode ? controlRoot.ScrollBar.vertical.width : 0 - readonly property real horizontalScrollBarHeight: controlRoot.ScrollBar.horizontal.visible && !Kirigami.Settings.tabletMode ? controlRoot.ScrollBar.horizontal.height : 0 + readonly property real verticalScrollBarWidth: controlRoot.ScrollBar.vertical.visible && controlRoot.ScrollBar.vertical.interactive ? controlRoot.ScrollBar.vertical.width : 0 + readonly property real horizontalScrollBarHeight: controlRoot.ScrollBar.horizontal.visible && controlRoot.ScrollBar.vertical.interactive ? controlRoot.ScrollBar.horizontal.height : 0 } ] + ScrollBar.vertical: ScrollBar { - id: verticalScrollBar parent: controlRoot - enabled: controlRoot.contentItem.enabled - + z: 1 x: controlRoot.mirrored ? (internal.backgroundVisible && controlRoot.background.hasOwnProperty("leftPadding") ? controlRoot.background.leftPadding : 0) - : controlRoot.width - width - (internal.backgroundVisible && controlRoot.background.hasOwnProperty("rightPadding") ? controlRoot.background.rightPadding: 0) + : controlRoot.width - width - (internal.backgroundVisible && controlRoot.background.hasOwnProperty("rightPadding") ? controlRoot.background.rightPadding : 0) y: controlRoot.topPadding height: controlRoot.availableHeight - active: controlRoot.ScrollBar.horizontal || controlRoot.ScrollBar.horizontal.active + active: controlRoot.ScrollBar.horizontal.active } ScrollBar.horizontal: ScrollBar { parent: controlRoot - enabled: controlRoot.contentItem.enabled + z: 1 x: controlRoot.leftPadding y: controlRoot.height - height - (internal.backgroundVisible && controlRoot.background.hasOwnProperty("bottomPadding") ? controlRoot.background.bottomPadding : 0) width: controlRoot.availableWidth - active: controlRoot.ScrollBar.vertical || controlRoot.ScrollBar.vertical.active + active: controlRoot.ScrollBar.vertical.active } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/Slider.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/Slider.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/Slider.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/Slider.qml 2022-06-04 15:50:27.000000000 +0200 @@ -36,10 +36,10 @@ contentHeight: horizontal ? (Kirigami.Settings.tabletMode ? 24 : 22) : controlRoot.implicitHeight anchors.verticalCenter: controlRoot.verticalCenter - maximum: controlRoot.to*100 - minimum: controlRoot.from*100 - step: controlRoot.stepSize*100 - value: controlRoot.value*100 + maximum: 10000 * controlRoot.to + minimum: 10000 * controlRoot.from + step: 10000 * controlRoot.stepSize + value: 10000 * controlRoot.value horizontal: controlRoot.orientation === Qt.Horizontal enabled: controlRoot.enabled hasFocus: controlRoot.activeFocus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/SpinBox.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/SpinBox.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/SpinBox.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/SpinBox.qml 2022-06-04 15:50:27.000000000 +0200 @@ -27,7 +27,6 @@ readonly property int ___lPadding: styleitem.upRectSizeHint.x === styleitem.downRectSizeHint.x ? horizontalPadding : styleitem.upRectSizeHint.width readonly property int ___rPadding: styleitem.upRectSizeHint.x === styleitem.downRectSizeHint.x ? styleitem.upRectSizeHint.width : styleitem.downRectSizeHint.width - hoverEnabled: true wheelEnabled: true editable: true @@ -86,7 +85,6 @@ y: styleitem.downRect.y } - background: StylePrivate.StyleItem { id: styleitem control: controlRoot @@ -115,10 +113,10 @@ onHeightChanged: recompute() value: (controlRoot.up.pressed ? 1 : 0) | - (controlRoot.down.pressed ? 1<<1 : 0) | - ( controlRoot.value != controlRoot.to ? (1<<2) : 0) | - (controlRoot.value != controlRoot.from ? (1<<3) : 0) | - (controlRoot.up.hovered ? 0x1 : 0) | - (controlRoot.down.hovered ? (1<<1) : 0) + (controlRoot.down.pressed ? 1 << 1 : 0) | + (controlRoot.value !== controlRoot.to ? (1 << 2) : 0) | + (controlRoot.value !== controlRoot.from ? (1 << 3) : 0) | + (controlRoot.up.hovered ? 1 : 0) | + (controlRoot.down.hovered ? (1 << 1) : 0) } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/SwitchDelegate.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/SwitchDelegate.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/SwitchDelegate.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/SwitchDelegate.qml 2022-06-04 15:50:27.000000000 +0200 @@ -16,15 +16,14 @@ implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding implicitHeight: Math.max(contentItem.implicitHeight, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding hoverEnabled: true padding: Kirigami.Settings.tabletMode ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing - leftPadding: padding*2 topPadding: padding - - rightPadding: padding*2 + leftPadding: padding * 2 + rightPadding: padding * 2 bottomPadding: padding contentItem: Label { @@ -43,7 +42,6 @@ indicator: SwitchIndicator { x: controlRoot.mirrored ? controlRoot.leftPadding : controlRoot.width - width - controlRoot.rightPadding y: controlRoot.topPadding + (controlRoot.availableHeight - height) / 2 - control: controlRoot } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/SwitchIndicator.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/SwitchIndicator.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/SwitchIndicator.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/SwitchIndicator.qml 2022-06-04 15:50:27.000000000 +0200 @@ -13,7 +13,7 @@ property alias control: slider.control implicitWidth: 32 - implicitHeight : 22 + implicitHeight: 22 StylePrivate.StyleItem { id: slider @@ -27,4 +27,3 @@ enabled: control.enabled } } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/TabBar.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/TabBar.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/TabBar.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/TabBar.qml 2022-06-04 15:50:27.000000000 +0200 @@ -31,7 +31,7 @@ model: controlRoot.contentModel currentIndex: controlRoot.currentIndex - spacing: -styleItem.pixelMetric("tabOverlap")-1 + spacing: -styleItem.pixelMetric("tabOverlap") - 1 orientation: ListView.Horizontal boundsBehavior: Flickable.StopAtBounds flickableDirection: Flickable.AutoFlickIfNeeded @@ -49,7 +49,7 @@ visible: false elementType: "tabframe" properties: { - "orientation" : controlRoot.position == T.TabBar.Header ? "Top" : "Bottom" + "orientation": controlRoot.position === T.TabBar.Header ? "Top" : "Bottom" } } @@ -57,7 +57,7 @@ acceptedButtons: Qt.NoButton onWheel: { if (wheel.pixelDelta.y < 0 || wheel.angleDelta.y < 0) { - controlRoot.currentIndex = Math.min(controlRoot.currentIndex + 1, controlRoot.contentModel.count -1); + controlRoot.currentIndex = Math.min(controlRoot.currentIndex + 1, controlRoot.contentModel.count - 1); } else { controlRoot.currentIndex = Math.max(controlRoot.currentIndex - 1, 0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/TextArea.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/TextArea.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/TextArea.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/TextArea.qml 2022-06-04 15:50:27.000000000 +0200 @@ -78,7 +78,7 @@ selectionStart: controlRoot.selectionStart selectionEnd: controlRoot.selectionEnd misspelledColor: Kirigami.Theme.negativeTextColor - active: activable && settings.checkerEnabledByDefault + active: spellcheckhighlighterLoader.activable && settings.checkerEnabledByDefault onChangeCursorPosition: { controlRoot.cursorPosition = start; @@ -104,7 +104,7 @@ Private.MobileCursor { target: controlRoot selectionStartHandle: true - property var rect: target.positionToRectangle(target.selectionStart) + readonly property rect rect: target.positionToRectangle(target.selectionStart) x: rect.x y: rect.y } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/TextField.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/TextField.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/TextField.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/TextField.qml 2022-06-04 15:50:27.000000000 +0200 @@ -54,19 +54,19 @@ } onTextChanged: Private.MobileTextActionsToolBar.shouldBeVisible = false; - + onPressed: Private.MobileTextActionsToolBar.shouldBeVisible = true; - + TapHandler { acceptedDevices: PointerDevice.Mouse | PointerDevice.Stylus acceptedButtons: Qt.LeftButton | Qt.RightButton - + // unfortunately, taphandler's pressed event only triggers when the press is lifted // we need to use the longpress signal since it triggers when the button is first pressed longPressThreshold: 0 onLongPressed: Private.TextFieldContextMenu.targetClick(point, controlRoot, null, null); } - + Keys.onPressed: { // trigger if context menu button is pressed Private.TextFieldContextMenu.targetKeyPressed(event, controlRoot) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/ToolBar.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/ToolBar.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/ToolBar.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/ToolBar.qml 2022-06-04 15:50:27.000000000 +0200 @@ -18,12 +18,12 @@ padding: Kirigami.Units.smallSpacing contentItem: Item {} - position: controlRoot.parent.footer == controlRoot ? ToolBar.Footer : ToolBar.Header + position: controlRoot.parent.footer === controlRoot ? ToolBar.Footer : ToolBar.Header // Use Header colors if it's a header and Header colors are available // (if not, this will fall back to window colors) // Window colors - Kirigami.Theme.colorSet: position == T.ToolBar.Footer || (parent.footer && parent.footer == controlRoot) ? Kirigami.Theme.Window : Kirigami.Theme.Header + Kirigami.Theme.colorSet: position === T.ToolBar.Footer || (parent.footer && parent.footer === controlRoot) ? Kirigami.Theme.Window : Kirigami.Theme.Header Kirigami.Theme.inherit: false background: Rectangle { @@ -33,8 +33,8 @@ anchors { left: parent.left right: parent.right - top: controlRoot.position == T.ToolBar.Footer || (controlRoot.parent.footer && controlRoot.parent.footer == controlRoot) ? parent.top : undefined - bottom: controlRoot.position == T.ToolBar.Footer || (controlRoot.parent.footer && controlRoot.parent.footer == controlRoot) ? undefined : parent.bottom + top: controlRoot.position === T.ToolBar.Footer || (controlRoot.parent.footer && controlRoot.parent.footer === controlRoot) ? parent.top : undefined + bottom: controlRoot.position === T.ToolBar.Footer || (controlRoot.parent.footer && controlRoot.parent.footer === controlRoot) ? undefined : parent.bottom } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/ToolButton.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/ToolButton.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/ToolButton.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/ToolButton.qml 2022-06-04 15:50:27.000000000 +0200 @@ -48,7 +48,6 @@ hover: controlRoot.hovered text: controlRoot.Kirigami.MnemonicData.mnemonicLabel hasFocus: controlRoot.visualFocus || (!controlRoot.flat && controlRoot.pressed) || controlRoot.highlighted - activeControl: controlRoot.isDefault ? "default" : "f" flat: controlRoot.flat // Set this to true to have the style render a menu arrow for the @@ -58,20 +57,23 @@ // QtQuick styles! property bool showMenuArrow: false + readonly property int toolButtonStyle: { + switch (controlRoot.display) { + case T.ToolButton.IconOnly: return Qt.ToolButtonIconOnly; + case T.ToolButton.TextOnly: return Qt.ToolButtonTextOnly; + case T.ToolButton.TextBesideIcon: return Qt.ToolButtonTextBesideIcon; + case T.ToolButton.TextUnderIcon: return Qt.ToolButtonTextUnderIcon; + default: return Qt.ToolButtonFollowStyle; + } + } + properties: { "icon": controlRoot.icon ? (controlRoot.icon.name || controlRoot.icon.source) : "", - "iconColor": controlRoot.icon && controlRoot.icon.color.a > 0? controlRoot.icon.color : Kirigami.Theme.textColor, + "iconColor": controlRoot.icon && controlRoot.icon.color.a > 0 ? controlRoot.icon.color : Kirigami.Theme.textColor, "iconWidth": controlRoot.icon ? controlRoot.icon.width : 0, "iconHeight": controlRoot.icon ? controlRoot.icon.height : 0, "menu": showMenuArrow, - "toolButtonStyle": controlRoot.display == T.ToolButton.IconOnly - ? Qt.ToolButtonIconOnly : - controlRoot.display == T.ToolButton.TextOnly - ? Qt.ToolButtonTextOnly : - controlRoot.display == T.ToolButton.TextBesideIcon - ? Qt.ToolButtonTextBesideIcon : - controlRoot.display == T.ToolButton.TextUnderIcon - ? Qt.ToolButtonTextUnderIcon : Qt.ToolButtonFollowStyle + "toolButtonStyle": toolButtonStyle, } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/org.kde.desktop/ToolSeparator.qml new/qqc2-desktop-style-5.95.0/org.kde.desktop/ToolSeparator.qml --- old/qqc2-desktop-style-5.94.0/org.kde.desktop/ToolSeparator.qml 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/org.kde.desktop/ToolSeparator.qml 2022-06-04 15:50:27.000000000 +0200 @@ -19,7 +19,7 @@ contentItem: Kirigami.Separator { // implicitHeight is the same as ToolBar implicitHeight minus ToolBar padding if not horizontal - implicitHeight: horizontal ? 1 : 40 - (Kirigami.Units.smallSpacing * 2) implicitWidth: !horizontal ? 1 : 40 - (Kirigami.Units.smallSpacing * 2) + implicitHeight: horizontal ? 1 : 40 - (Kirigami.Units.smallSpacing * 2) } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/plugin/CMakeLists.txt new/qqc2-desktop-style-5.95.0/plugin/CMakeLists.txt --- old/qqc2-desktop-style-5.94.0/plugin/CMakeLists.txt 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/plugin/CMakeLists.txt 2022-06-04 15:50:27.000000000 +0200 @@ -6,15 +6,6 @@ kpropertywriter.cpp ) -if(Qt5_VERSION VERSION_LESS "5.8.0") -set(qqc2desktopstyle_SRCS - ${qqc2desktopstyle_SRCS} - #FIXME: remove when we can depend from Qt 5.8+ - qsgninepatchnode.cpp - qsgdefaultninepatchnode.cpp - ) -endif() - add_library(qqc2desktopstyleplugin SHARED ${qqc2desktopstyle_SRCS}) target_link_libraries(qqc2desktopstyleplugin Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Qml Qt${QT_MAJOR_VERSION}::Quick Qt${QT_MAJOR_VERSION}::Gui Qt${QT_MAJOR_VERSION}::Widgets KF5::ConfigCore KF5::Kirigami2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/plugin/qsgdefaultninepatchnode.cpp new/qqc2-desktop-style-5.95.0/plugin/qsgdefaultninepatchnode.cpp --- old/qqc2-desktop-style-5.94.0/plugin/qsgdefaultninepatchnode.cpp 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/plugin/qsgdefaultninepatchnode.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,52 +0,0 @@ -/* - SPDX-FileCopyrightText: 2016 The Qt Company Ltd. <https://www.qt.io/licensing/> - - This file is part of the QtQuick module of the Qt Toolkit. - - SPDX-License-Identifier: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KFQF-Accepted-GPL OR LicenseRef-Qt-Commercial -*/ - -#include "qsgdefaultninepatchnode_p.h" - -QT_BEGIN_NAMESPACE - -QSGDefaultNinePatchNode::QSGDefaultNinePatchNode() - : m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4) -{ - setGeometry(&m_geometry); - setMaterial(&m_material); -} - -QSGDefaultNinePatchNode::~QSGDefaultNinePatchNode() -{ - delete m_material.texture(); -} - -void QSGDefaultNinePatchNode::setTexture(QSGTexture *texture) -{ - delete m_material.texture(); - m_material.setTexture(texture); -} - -void QSGDefaultNinePatchNode::setBounds(const QRectF &bounds) -{ - m_bounds = bounds; -} - -void QSGDefaultNinePatchNode::setDevicePixelRatio(qreal ratio) -{ - m_devicePixelRatio = ratio; -} - -void QSGDefaultNinePatchNode::setPadding(qreal left, qreal top, qreal right, qreal bottom) -{ - m_padding = QVector4D(left, top, right, bottom); -} - -void QSGDefaultNinePatchNode::update() -{ - rebuildGeometry(m_material.texture(), &m_geometry, m_padding, m_bounds, m_devicePixelRatio); - markDirty(QSGNode::DirtyGeometry | QSGNode::DirtyMaterial); -} - -QT_END_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/plugin/qsgdefaultninepatchnode_p.h new/qqc2-desktop-style-5.95.0/plugin/qsgdefaultninepatchnode_p.h --- old/qqc2-desktop-style-5.94.0/plugin/qsgdefaultninepatchnode_p.h 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/plugin/qsgdefaultninepatchnode_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,52 +0,0 @@ -/* - SPDX-FileCopyrightText: 2016 The Qt Company Ltd. <https://www.qt.io/licensing/> - - This file is part of the QtQuick module of the Qt Toolkit. - - SPDX-License-Identifier: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KFQF-Accepted-GPL OR LicenseRef-Qt-Commercial -*/ - -#ifndef QSGDEFAULTNINEPATCHNODE_P_H -#define QSGDEFAULTNINEPATCHNODE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -//#include <private/qtquickglobal_p.h> -#include <QSGNinePatchNode> -#include <QtQuick/qsggeometry.h> -#include <QtQuick/qsgtexturematerial.h> - -QT_BEGIN_NAMESPACE - -class QSGDefaultNinePatchNode : public QSGNinePatchNode -{ -public: - QSGDefaultNinePatchNode(); - ~QSGDefaultNinePatchNode() override; - - void setTexture(QSGTexture *texture) override; - void setBounds(const QRectF &bounds) override; - void setDevicePixelRatio(qreal ratio) override; - void setPadding(qreal left, qreal top, qreal right, qreal bottom) override; - void update() override; - -private: - QRectF m_bounds; - qreal m_devicePixelRatio; - QVector4D m_padding; - QSGGeometry m_geometry; - QSGTextureMaterial m_material; -}; - -QT_END_NAMESPACE - -#endif // QSGDEFAULTNINEPATCHNODE_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/plugin/qsgninepatchnode.cpp new/qqc2-desktop-style-5.95.0/plugin/qsgninepatchnode.cpp --- old/qqc2-desktop-style-5.94.0/plugin/qsgninepatchnode.cpp 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/plugin/qsgninepatchnode.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -/* - SPDX-FileCopyrightText: 2016 The Qt Company Ltd. <https://www.qt.io/licensing/> - - This file is part of the QtQuick module of the Qt Toolkit. - - SPDX-License-Identifier: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KFQF-Accepted-GPL OR LicenseRef-Qt-Commercial -*/ - -#include <QSGNinePatchNode> - -QT_BEGIN_NAMESPACE - -/*! - \class QSGNinePatchNode - \inmodule QtQuick - \since 5.8 - \internal - */ - -/*! - \fn void QSGNinePatchNode::setTexture(QSGTexture *texture) - \internal - */ - -/*! - \fn void QSGNinePatchNode::setBounds(const QRectF &bounds) - \internal - */ - -/*! - \fn void QSGNinePatchNode::setDevicePixelRatio(qreal ratio) - \internal - */ - -/*! - \fn void QSGNinePatchNode::setPadding(qreal left, qreal top, qreal right, qreal bottom) - \internal - */ - -/*! - \fn void QSGNinePatchNode::update() - \internal - */ - -void QSGNinePatchNode::rebuildGeometry(QSGTexture *texture, QSGGeometry *geometry, const QVector4D &padding, const QRectF &bounds, qreal dpr) -{ - if (padding.x() <= 0 && padding.y() <= 0 && padding.z() <= 0 && padding.w() <= 0) { - geometry->allocate(4, 0); - QSGGeometry::updateTexturedRectGeometry(geometry, bounds, texture->normalizedTextureSubRect()); - return; - } - - QRectF tc = texture->normalizedTextureSubRect(); - QSize ts = texture->textureSize(); - ts.setHeight(ts.height() / dpr); - ts.setWidth(ts.width() / dpr); - - qreal invtw = tc.width() / ts.width(); - qreal invth = tc.height() / ts.height(); - - struct Coord { - qreal p; - qreal t; - }; - Coord cx[4] = {{bounds.left(), tc.left()}, - {bounds.left() + padding.x(), tc.left() + padding.x() * invtw}, - {bounds.right() - padding.z(), tc.right() - padding.z() * invtw}, - {bounds.right(), tc.right()}}; - Coord cy[4] = {{bounds.top(), tc.top()}, - {bounds.top() + padding.y(), tc.top() + padding.y() * invth}, - {bounds.bottom() - padding.w(), tc.bottom() - padding.w() * invth}, - {bounds.bottom(), tc.bottom()}}; - - geometry->allocate(16, 28); - QSGGeometry::TexturedPoint2D *v = geometry->vertexDataAsTexturedPoint2D(); - for (int y = 0; y < 4; ++y) { - for (int x = 0; x < 4; ++x) { - v->set(cx[x].p, cy[y].p, cx[x].t, cy[y].t); - ++v; - } - } - - quint16 *i = geometry->indexDataAsUShort(); - for (int r = 0; r < 3; ++r) { - if (r > 0) - *i++ = 4 * r; - for (int c = 0; c < 4; ++c) { - i[0] = 4 * r + c; - i[1] = 4 * r + c + 4; - i += 2; - } - if (r < 2) - *i++ = 4 * r + 3 + 4; - } -} - -QT_END_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.94.0/plugin/qsgninepatchnode.h new/qqc2-desktop-style-5.95.0/plugin/qsgninepatchnode.h --- old/qqc2-desktop-style-5.94.0/plugin/qsgninepatchnode.h 2022-04-10 00:16:59.000000000 +0200 +++ new/qqc2-desktop-style-5.95.0/plugin/qsgninepatchnode.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -/* - SPDX-FileCopyrightText: 2016 The Qt Company Ltd. <https://www.qt.io/licensing/> - - This file is part of the QtQuick module of the Qt Toolkit. - - SPDX-License-Identifier: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KFQF-Accepted-GPL OR LicenseRef-Qt-Commercial -*/ - -#ifndef QSGNINEPATCHNODE_H -#define QSGNINEPATCHNODE_H - -#include <QtQuick/qsgnode.h> -#include <QtQuick/qsgtexture.h> - -QT_BEGIN_NAMESPACE - -class Q_QUICK_EXPORT QSGNinePatchNode : public QSGGeometryNode -{ -public: - virtual ~QSGNinePatchNode() - { - } - - virtual void setTexture(QSGTexture *texture) = 0; - virtual void setBounds(const QRectF &bounds) = 0; - virtual void setDevicePixelRatio(qreal ratio) = 0; - virtual void setPadding(qreal left, qreal top, qreal right, qreal bottom) = 0; - virtual void update() = 0; - - static void rebuildGeometry(QSGTexture *texture, QSGGeometry *geometry, const QVector4D &padding, const QRectF &bounds, qreal dpr); -}; - -QT_END_NAMESPACE - -#endif // QSGNINEPATCHNODE_H
