From bc4510077f04c1df8f1df64f1b3a2d2595312f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Fri, 19 Apr 2024 01:04:13 +0800 Subject: [PATCH] update --- src/Qt5/imports/FluentUI/Controls/FluComboBox.qml | 5 ++--- src/Qt5/imports/FluentUI/Controls/FluTableView.qml | 6 +++--- src/Qt6/imports/FluentUI/Controls/FluComboBox.qml | 5 ++--- src/Qt6/imports/FluentUI/Controls/FluTableView.qml | 6 +++--- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml b/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml index bf0c955a..4618f2fd 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml @@ -134,10 +134,9 @@ T.ComboBox { } } background:Rectangle{ - color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(249/255,249/255,249/255,1) - border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1) - border.width: 1 radius: 5 + color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1) + border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1) FluShadow{ radius: 5 } diff --git a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml index 8cb9c66b..97703723 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml @@ -778,9 +778,9 @@ Rectangle { timer_vertical_force_layout.restart() } Connections{ - target: table_model - function onRowCountChanged(){ - header_row_model.rows = Array.from({length: table_model.rows.length}, (_, i) => ({rowIndex:i+1})) + target: table_view + function onRowsChanged(){ + header_row_model.rows = Array.from({length: table_view.rows}, (_, i) => ({rowIndex:i+1})) } } Timer{ diff --git a/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml b/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml index 5c3c940a..6a89782b 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml @@ -134,10 +134,9 @@ T.ComboBox { } } background:Rectangle{ - color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(249/255,249/255,249/255,1) - border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1) - border.width: 1 radius: 5 + color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1) + border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1) FluShadow{ radius: 5 } diff --git a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml index 90b027a0..9f0b36c0 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml @@ -778,9 +778,9 @@ Rectangle { timer_vertical_force_layout.restart() } Connections{ - target: table_model - function onRowCountChanged(){ - header_row_model.rows = Array.from({length: table_model.rows.length}, (_, i) => ({rowIndex:i+1})) + target: table_view + function onRowsChanged(){ + header_row_model.rows = Array.from({length: table_view.rows}, (_, i) => ({rowIndex:i+1})) } } Timer{