From ee071ee451f92beb1f42c567da1223024910a17c Mon Sep 17 00:00:00 2001 From: zhuzichu Date: Tue, 17 Oct 2023 16:27:44 +0800 Subject: [PATCH] update --- .../imports/FluentUI/Controls/FluTableView.qml | 17 ++--------------- .../imports/FluentUI/Controls/FluTableView.qml | 17 ++--------------- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml index c03a3c9e..2f6a6513 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml @@ -7,9 +7,6 @@ import FluentUI 1.0 Rectangle { property var columnSource property var dataSource - property color selectionColor: FluTools.colorAlpha(FluTheme.primaryColor.lightest,0.6) - property color hoverButtonColor: FluTools.colorAlpha(selectionColor,0.2) - property color pressedButtonColor: FluTools.colorAlpha(selectionColor,0.4) property color borderColor: FluTheme.dark ? "#252525" : "#e4e4e4" property alias tableModel: table_model id:control @@ -397,12 +394,7 @@ Rectangle { readonly property var obj : columnSource[column] implicitWidth: item_column_loader.item.implicitWidth + (cellPadding * 2) implicitHeight: Math.max(36, item_column_loader.item.implicitHeight + (cellPadding * 2)) - color:{ - if(column_item_control_mouse.pressed){ - return control.pressedButtonColor - } - return column_item_control_mouse.containsMouse&&!canceled ? control.hoverButtonColor : FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1) - } + color: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1) Rectangle{ border.color: control.borderColor width: parent.width @@ -546,12 +538,7 @@ Rectangle { property bool canceled: false implicitWidth: Math.max(30, row_text.implicitWidth + (cellPadding * 2)) implicitHeight: row_text.implicitHeight + (cellPadding * 2) - color: { - if(item_control_mouse.pressed){ - return control.pressedButtonColor - } - return item_control_mouse.containsMouse&&!canceled ? control.hoverButtonColor : FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1) - } + color: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1) Rectangle{ border.color: control.borderColor width: parent.width diff --git a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml index 83534b5c..d913d61e 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml @@ -8,9 +8,6 @@ import FluentUI Rectangle { property var columnSource property var dataSource - property color selectionColor: FluTools.colorAlpha(FluTheme.primaryColor.lightest,0.6) - property color hoverButtonColor: FluTools.colorAlpha(selectionColor,0.2) - property color pressedButtonColor: FluTools.colorAlpha(selectionColor,0.4) property color borderColor: FluTheme.dark ? "#252525" : "#e4e4e4" property alias tableModel: table_model id:control @@ -398,12 +395,7 @@ Rectangle { readonly property var obj : columnSource[column] implicitWidth: item_column_loader.item.implicitWidth + (cellPadding * 2) implicitHeight: Math.max(36, item_column_loader.item.implicitHeight + (cellPadding * 2)) - color:{ - if(column_item_control_mouse.pressed){ - return control.pressedButtonColor - } - return column_item_control_mouse.containsMouse&&!canceled ? control.hoverButtonColor : FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1) - } + color: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1) Rectangle{ border.color: control.borderColor width: parent.width @@ -547,12 +539,7 @@ Rectangle { property bool canceled: false implicitWidth: Math.max(30, row_text.implicitWidth + (cellPadding * 2)) implicitHeight: row_text.implicitHeight + (cellPadding * 2) - color: { - if(item_control_mouse.pressed){ - return control.pressedButtonColor - } - return item_control_mouse.containsMouse&&!canceled ? control.hoverButtonColor : FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1) - } + color: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1) Rectangle{ border.color: control.borderColor width: parent.width