amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-23 19:20:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhuzichu 2023-10-17 16:27:44 +08:00
parent 487cbefd82
commit ee071ee451
2 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Qt5/imports/FluentUI/Controls/FluTableView.qml
View File

@ -7,9 +7,6 @@ import FluentUI 1.0
Rectangle { Rectangle {
property var columnSource property var columnSource
property var dataSource 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 color borderColor: FluTheme.dark ? "#252525" : "#e4e4e4"
property alias tableModel: table_model property alias tableModel: table_model
id:control id:control
@ -397,12 +394,7 @@ Rectangle {
readonly property var obj : columnSource[column] readonly property var obj : columnSource[column]
implicitWidth: item_column_loader.item.implicitWidth + (cellPadding * 2) implicitWidth: item_column_loader.item.implicitWidth + (cellPadding * 2)
implicitHeight: Math.max(36, item_column_loader.item.implicitHeight + (cellPadding * 2)) implicitHeight: Math.max(36, item_column_loader.item.implicitHeight + (cellPadding * 2))
color:{ color: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1)
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)
}
Rectangle{ Rectangle{
border.color: control.borderColor border.color: control.borderColor
width: parent.width width: parent.width
@ -546,12 +538,7 @@ Rectangle {
property bool canceled: false property bool canceled: false
implicitWidth: Math.max(30, row_text.implicitWidth + (cellPadding * 2)) implicitWidth: Math.max(30, row_text.implicitWidth + (cellPadding * 2))
implicitHeight: row_text.implicitHeight + (cellPadding * 2) implicitHeight: row_text.implicitHeight + (cellPadding * 2)
color: { color: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1)
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)
}
Rectangle{ Rectangle{
border.color: control.borderColor border.color: control.borderColor
width: parent.width width: parent.width

17
src/Qt6/imports/FluentUI/Controls/FluTableView.qml
View File

@ -8,9 +8,6 @@ import FluentUI
Rectangle { Rectangle {
property var columnSource property var columnSource
property var dataSource 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 color borderColor: FluTheme.dark ? "#252525" : "#e4e4e4"
property alias tableModel: table_model property alias tableModel: table_model
id:control id:control
@ -398,12 +395,7 @@ Rectangle {
readonly property var obj : columnSource[column] readonly property var obj : columnSource[column]
implicitWidth: item_column_loader.item.implicitWidth + (cellPadding * 2) implicitWidth: item_column_loader.item.implicitWidth + (cellPadding * 2)
implicitHeight: Math.max(36, item_column_loader.item.implicitHeight + (cellPadding * 2)) implicitHeight: Math.max(36, item_column_loader.item.implicitHeight + (cellPadding * 2))
color:{ color: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1)
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)
}
Rectangle{ Rectangle{
border.color: control.borderColor border.color: control.borderColor
width: parent.width width: parent.width
@ -547,12 +539,7 @@ Rectangle {
property bool canceled: false property bool canceled: false
implicitWidth: Math.max(30, row_text.implicitWidth + (cellPadding * 2)) implicitWidth: Math.max(30, row_text.implicitWidth + (cellPadding * 2))
implicitHeight: row_text.implicitHeight + (cellPadding * 2) implicitHeight: row_text.implicitHeight + (cellPadding * 2)
color: { color: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1)
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)
}
Rectangle{ Rectangle{
border.color: control.borderColor border.color: control.borderColor
width: parent.width width: parent.width