From d44bbcfefcfbe7cb3eae1baea8f7d3acf1483417 Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Tue, 7 Apr 2026 22:59:38 +0200 Subject: [PATCH] fix some "overrides a member of the base object" warnings --- .../ii/modules/common/widgets/ButtonGroup.qml | 2 +- .../ii/modules/common/widgets/ContentPage.qml | 2 +- .../modules/common/widgets/ContentSection.qml | 2 +- .../common/widgets/ContentSubsection.qml | 2 +- .../common/widgets/NavigationRailTabArray.qml | 2 +- .../ii/modules/common/widgets/NoticeBox.qml | 2 +- .../ii/modules/common/widgets/Toolbar.qml | 2 +- .../ii/modules/common/widgets/WindowDialog.qml | 2 +- .../quickshell/ii/modules/ii/dock/DockApps.qml | 17 ++++++----------- .../ii/modules/waffle/lock/WaffleLock.qml | 2 +- .../ii/modules/waffle/looks/WToolbar.qml | 2 +- .../startMenu/startPage/StartPageApps.qml | 2 +- 12 files changed, 17 insertions(+), 22 deletions(-) diff --git a/dots/.config/quickshell/ii/modules/common/widgets/ButtonGroup.qml b/dots/.config/quickshell/ii/modules/common/widgets/ButtonGroup.qml index d3c9114eb..b36ad87cf 100644 --- a/dots/.config/quickshell/ii/modules/common/widgets/ButtonGroup.qml +++ b/dots/.config/quickshell/ii/modules/common/widgets/ButtonGroup.qml @@ -9,7 +9,7 @@ import QtQuick.Layouts */ Rectangle { id: root - default property alias data: rowLayout.data + default property alias groupData: rowLayout.data property alias uniformCellSizes: rowLayout.uniformCellSizes property real spacing: 5 property real padding: 0 diff --git a/dots/.config/quickshell/ii/modules/common/widgets/ContentPage.qml b/dots/.config/quickshell/ii/modules/common/widgets/ContentPage.qml index 7ef96e993..7aa7f2440 100644 --- a/dots/.config/quickshell/ii/modules/common/widgets/ContentPage.qml +++ b/dots/.config/quickshell/ii/modules/common/widgets/ContentPage.qml @@ -9,7 +9,7 @@ StyledFlickable { property bool forceWidth: false property real bottomContentPadding: 100 - default property alias data: contentColumn.data + default property alias contentData: contentColumn.data clip: true contentHeight: contentColumn.implicitHeight + root.bottomContentPadding // Add some padding at the bottom diff --git a/dots/.config/quickshell/ii/modules/common/widgets/ContentSection.qml b/dots/.config/quickshell/ii/modules/common/widgets/ContentSection.qml index 0ff800c06..8f20e3b63 100644 --- a/dots/.config/quickshell/ii/modules/common/widgets/ContentSection.qml +++ b/dots/.config/quickshell/ii/modules/common/widgets/ContentSection.qml @@ -8,7 +8,7 @@ ColumnLayout { id: root property string title property string icon: "" - default property alias data: sectionContent.data + default property alias contentData: sectionContent.data Layout.fillWidth: true spacing: 6 diff --git a/dots/.config/quickshell/ii/modules/common/widgets/ContentSubsection.qml b/dots/.config/quickshell/ii/modules/common/widgets/ContentSubsection.qml index 6c3824e08..357ce7428 100644 --- a/dots/.config/quickshell/ii/modules/common/widgets/ContentSubsection.qml +++ b/dots/.config/quickshell/ii/modules/common/widgets/ContentSubsection.qml @@ -7,7 +7,7 @@ ColumnLayout { id: root property string title: "" property string tooltip: "" - default property alias data: sectionContent.data + default property alias contentData: sectionContent.data Layout.fillWidth: true Layout.topMargin: 4 diff --git a/dots/.config/quickshell/ii/modules/common/widgets/NavigationRailTabArray.qml b/dots/.config/quickshell/ii/modules/common/widgets/NavigationRailTabArray.qml index 01d27ba73..49b25f584 100644 --- a/dots/.config/quickshell/ii/modules/common/widgets/NavigationRailTabArray.qml +++ b/dots/.config/quickshell/ii/modules/common/widgets/NavigationRailTabArray.qml @@ -7,7 +7,7 @@ Item { id: root property int currentIndex: 0 property bool expanded: false - default property alias data: tabBarColumn.data + default property alias tabData: tabBarColumn.data implicitHeight: tabBarColumn.implicitHeight implicitWidth: tabBarColumn.implicitWidth Layout.topMargin: 25 diff --git a/dots/.config/quickshell/ii/modules/common/widgets/NoticeBox.qml b/dots/.config/quickshell/ii/modules/common/widgets/NoticeBox.qml index c6a1d29c6..d5c56860d 100644 --- a/dots/.config/quickshell/ii/modules/common/widgets/NoticeBox.qml +++ b/dots/.config/quickshell/ii/modules/common/widgets/NoticeBox.qml @@ -7,7 +7,7 @@ Rectangle { id: root property alias materialIcon: icon.text property alias text: noticeText.text - default property alias data: buttonRow.data + default property alias boxData: buttonRow.data radius: Appearance.rounding.normal color: Appearance.colors.colPrimaryContainer diff --git a/dots/.config/quickshell/ii/modules/common/widgets/Toolbar.qml b/dots/.config/quickshell/ii/modules/common/widgets/Toolbar.qml index 51348c4fa..cc1dea8fa 100644 --- a/dots/.config/quickshell/ii/modules/common/widgets/Toolbar.qml +++ b/dots/.config/quickshell/ii/modules/common/widgets/Toolbar.qml @@ -14,7 +14,7 @@ Item { property real padding: 8 property alias colBackground: background.color property alias spacing: toolbarLayout.spacing - default property alias data: toolbarLayout.data + default property alias toolbarData: toolbarLayout.data implicitWidth: background.implicitWidth implicitHeight: background.implicitHeight property alias radius: background.radius diff --git a/dots/.config/quickshell/ii/modules/common/widgets/WindowDialog.qml b/dots/.config/quickshell/ii/modules/common/widgets/WindowDialog.qml index 16a82c4ee..06ec730f0 100644 --- a/dots/.config/quickshell/ii/modules/common/widgets/WindowDialog.qml +++ b/dots/.config/quickshell/ii/modules/common/widgets/WindowDialog.qml @@ -9,7 +9,7 @@ Rectangle { id: root property bool show: false - default property alias data: contentColumn.data + default property alias contentData: contentColumn.data property real backgroundHeight: dialogBackground.implicitHeight property real backgroundWidth: 350 property real backgroundAnimationMovementDistance: 60 diff --git a/dots/.config/quickshell/ii/modules/ii/dock/DockApps.qml b/dots/.config/quickshell/ii/modules/ii/dock/DockApps.qml index 6e5e4cbc5..8b4a3baab 100644 --- a/dots/.config/quickshell/ii/modules/ii/dock/DockApps.qml +++ b/dots/.config/quickshell/ii/modules/ii/dock/DockApps.qml @@ -170,18 +170,13 @@ Item { ButtonGroup { contentWidth: parent.width - anchors.margins * 2 - WrapperRectangle { + StyledText { + Layout.margins: 5 Layout.fillWidth: true - color: ColorUtils.transparentize(Appearance.colors.colSurfaceContainer) - radius: Appearance.rounding.small - margin: 5 - StyledText { - Layout.fillWidth: true - font.pixelSize: Appearance.font.pixelSize.small - text: windowButton.modelData?.title - elide: Text.ElideRight - color: Appearance.m3colors.m3onSurface - } + font.pixelSize: Appearance.font.pixelSize.small + text: windowButton.modelData?.title + elide: Text.ElideRight + color: Appearance.m3colors.m3onSurface } GroupButton { id: closeButton diff --git a/dots/.config/quickshell/ii/modules/waffle/lock/WaffleLock.qml b/dots/.config/quickshell/ii/modules/waffle/lock/WaffleLock.qml index b1ff6f353..ffca0484e 100644 --- a/dots/.config/quickshell/ii/modules/waffle/lock/WaffleLock.qml +++ b/dots/.config/quickshell/ii/modules/waffle/lock/WaffleLock.qml @@ -185,7 +185,7 @@ LockScreen { id: iconIndicator required property string baseIcon required property string icon - default property alias data: iconWidget.data + default property alias indicatorData: iconWidget.data implicitWidth: 40 implicitHeight: 40 FluentIcon { diff --git a/dots/.config/quickshell/ii/modules/waffle/looks/WToolbar.qml b/dots/.config/quickshell/ii/modules/waffle/looks/WToolbar.qml index 6d58e8f7c..c221535f7 100644 --- a/dots/.config/quickshell/ii/modules/waffle/looks/WToolbar.qml +++ b/dots/.config/quickshell/ii/modules/waffle/looks/WToolbar.qml @@ -10,7 +10,7 @@ Item { property alias colBackground: background.color property alias spacing: toolbarLayout.spacing property alias radius: background.radius - default property alias data: toolbarLayout.data + default property alias toolbarData: toolbarLayout.data implicitWidth: background.implicitWidth implicitHeight: background.implicitHeight diff --git a/dots/.config/quickshell/ii/modules/waffle/startMenu/startPage/StartPageApps.qml b/dots/.config/quickshell/ii/modules/waffle/startMenu/startPage/StartPageApps.qml index b4539b317..66586daa1 100644 --- a/dots/.config/quickshell/ii/modules/waffle/startMenu/startPage/StartPageApps.qml +++ b/dots/.config/quickshell/ii/modules/waffle/startMenu/startPage/StartPageApps.qml @@ -57,7 +57,7 @@ BodyRectangle { component PageSection: ColumnLayout { id: pageSection required property string title - default property alias data: pageSectionContentArea.data + default property alias pageData: pageSectionContentArea.data spacing: 16