From 7122407b0b31d76ed43c2cb6c9e377f3864d6902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Mon, 24 Jul 2023 21:49:32 +0800 Subject: [PATCH] update --- .../Controls/FluHorizontalHeaderView.qml | 27 ------------------- .../FluentUI/Controls/FluTableView.qml | 4 +-- .../Controls/FluVerticalHeaderView.qml | 27 ------------------- 3 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 src/imports/FluentUI/Controls/FluHorizontalHeaderView.qml delete mode 100644 src/imports/FluentUI/Controls/FluVerticalHeaderView.qml diff --git a/src/imports/FluentUI/Controls/FluHorizontalHeaderView.qml b/src/imports/FluentUI/Controls/FluHorizontalHeaderView.qml deleted file mode 100644 index 90369ebf..00000000 --- a/src/imports/FluentUI/Controls/FluHorizontalHeaderView.qml +++ /dev/null @@ -1,27 +0,0 @@ -import QtQuick -import QtQuick.Templates as T -import FluentUI - -T.HorizontalHeaderView { - id: control - implicitWidth: syncView ? syncView.width : 0 - implicitHeight: Math.max(1, contentHeight) - delegate: Rectangle { - readonly property real cellPadding: 8 - implicitWidth: text.implicitWidth + (cellPadding * 2) - implicitHeight: Math.max(control.height, text.implicitHeight + (cellPadding * 2)) - color:FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1) - border.color: FluTheme.dark ? "#252525" : "#e4e4e4" - FluText { - id: text - text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] - : model[control.textRole]) - : modelData - width: parent.width - height: parent.height - font.bold: true - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - } - } -} diff --git a/src/imports/FluentUI/Controls/FluTableView.qml b/src/imports/FluentUI/Controls/FluTableView.qml index b40f735a..b7225fee 100644 --- a/src/imports/FluentUI/Controls/FluTableView.qml +++ b/src/imports/FluentUI/Controls/FluTableView.qml @@ -322,7 +322,7 @@ Rectangle { property bool canceled: false readonly property var obj : columnSource[column] implicitWidth: column_text.implicitWidth + (cellPadding * 2) - implicitHeight: Math.max(header_horizontal.height, column_text.implicitHeight + (cellPadding * 2)) + implicitHeight: Math.max(36, column_text.implicitHeight + (cellPadding * 2)) color:{ d.selectionFlag if(column_item_control_mouse.pressed){ @@ -436,7 +436,7 @@ Rectangle { id:item_control readonly property real cellPadding: 8 property bool canceled: false - implicitWidth: Math.max(header_vertical.width, row_text.implicitWidth + (cellPadding * 2)) + implicitWidth: Math.max(30, row_text.implicitWidth + (cellPadding * 2)) implicitHeight: row_text.implicitHeight + (cellPadding * 2) color: { d.selectionFlag diff --git a/src/imports/FluentUI/Controls/FluVerticalHeaderView.qml b/src/imports/FluentUI/Controls/FluVerticalHeaderView.qml deleted file mode 100644 index 88809269..00000000 --- a/src/imports/FluentUI/Controls/FluVerticalHeaderView.qml +++ /dev/null @@ -1,27 +0,0 @@ -import QtQuick -import QtQuick.Templates as T -import FluentUI - -T.VerticalHeaderView { - id: control - implicitWidth: Math.max(1, contentWidth) - implicitHeight: syncView ? syncView.height : 0 - delegate: Rectangle { - readonly property real cellPadding: 8 - implicitWidth: Math.max(control.width, text.implicitWidth + (cellPadding * 2)) - implicitHeight: text.implicitHeight + (cellPadding * 2) - color:FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1) - border.color: FluTheme.dark ? "#252525" : "#e4e4e4" - FluText { - id: text - text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] - : model[control.textRole]) - : modelData - width: parent.width - font.bold: true - height: parent.height - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - } - } -}