amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-05-12 08:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: amass:6b9f7a1c9913714a147476d130eac34526b8030d
Branches Tags
amass:main
amass:1.7.7
amass:1.7.6
amass:1.7.5
amass:1.7.4
amass:1.7.3
amass:1.7.2
amass:1.7.1
amass:1.7.0
amass:1.6.9
amass:1.6.8
amass:1.6.7
amass:1.6.6
amass:1.6.5
amass:1.6.4
amass:1.6.3
amass:1.6.2
amass:1.6.1
amass:1.6.0
amass:1.5.9
amass:1.5.8
amass:1.5.7
amass:1.5.6
amass:1.5.5
amass:1.5.4
amass:1.5.3
amass:1.5.2
amass:1.5.1
amass:1.5.0
amass:1.4.0
amass:1.3.7.4
amass:1.3.7.3
amass:1.3.7.2
amass:1.3.7.1
amass:1.3.7.0
amass:1.3.6.2
amass:1.3.6.1
amass:1.3.6
amass:1.3.5.1
amass:1.3.5
amass:1.3.4
amass:1.3.3
amass:1.3.2.1
amass:1.3.2
amass:1.3.1
amass:1.3.0
amass:1.2.9
amass:1.2.8
amass:1.2.7
amass:1.2.6
amass:1.2.5
amass:1.2.4
amass:1.2.3
amass:1.2.2
amass:1.2.1
amass:1.2.0
amass:1.1.9
amass:1.1.8
amass:1.1.7
amass:1.1.6
amass:1.1.5
amass:1.1.4
amass:1.1.3
amass:1.1.2
amass:1.1.1
amass:1.1.0
amass:1.0.9
amass:1.0.8
amass:1.0.7
amass:1.0.6
amass:1.0.5
amass:1.0.4
amass:1.0.3
amass:1.0.2
amass:1.0.1
amass:1.0.0
..
compare: amass:b4a1eaa8602fbdfd6b682ad310692fd6a61a9cee
Branches Tags
amass:main
amass:1.7.7
amass:1.7.6
amass:1.7.5
amass:1.7.4
amass:1.7.3
amass:1.7.2
amass:1.7.1
amass:1.7.0
amass:1.6.9
amass:1.6.8
amass:1.6.7
amass:1.6.6
amass:1.6.5
amass:1.6.4
amass:1.6.3
amass:1.6.2
amass:1.6.1
amass:1.6.0
amass:1.5.9
amass:1.5.8
amass:1.5.7
amass:1.5.6
amass:1.5.5
amass:1.5.4
amass:1.5.3
amass:1.5.2
amass:1.5.1
amass:1.5.0
amass:1.4.0
amass:1.3.7.4
amass:1.3.7.3
amass:1.3.7.2
amass:1.3.7.1
amass:1.3.7.0
amass:1.3.6.2
amass:1.3.6.1
amass:1.3.6
amass:1.3.5.1
amass:1.3.5
amass:1.3.4
amass:1.3.3
amass:1.3.2.1
amass:1.3.2
amass:1.3.1
amass:1.3.0
amass:1.2.9
amass:1.2.8
amass:1.2.7
amass:1.2.6
amass:1.2.5
amass:1.2.4
amass:1.2.3
amass:1.2.2
amass:1.2.1
amass:1.2.0
amass:1.1.9
amass:1.1.8
amass:1.1.7
amass:1.1.6
amass:1.1.5
amass:1.1.4
amass:1.1.3
amass:1.1.2
amass:1.1.1
amass:1.1.0
amass:1.0.9
amass:1.0.8
amass:1.0.7
amass:1.0.6
amass:1.0.5
amass:1.0.4
amass:1.0.3
amass:1.0.2
amass:1.0.1
amass:1.0.0

No commits in common. "6b9f7a1c9913714a147476d130eac34526b8030d" and "b4a1eaa8602fbdfd6b682ad310692fd6a61a9cee" have entirely different histories.
6b9f7a1c99 ... b4a1eaa860

2 changed files with 56 additions and 36 deletions
Show Stats Expand all files Collapse all files

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

@ -266,18 +266,30 @@ Rectangle {
d.rowHoverIndex = row d.rowHoverIndex = row
} }
onWidthChanged: { onWidthChanged: {
updatePosition() if(editVisible){
updateEditPosition()
}
if(isMainTable){
updateTableItem()
}
} }
onHeightChanged: { onHeightChanged: {
updatePosition() if(editVisible){
updateEditPosition()
}
if(isMainTable){
updateTableItem()
}
} }
onXChanged: { onXChanged: {
updatePosition() if(editVisible){
updateEditPosition()
}
if(isMainTable){
updateTableItem()
}
} }
onYChanged: { onYChanged: {
updatePosition()
}
function updatePosition(){
if(editVisible){ if(editVisible){
updateEditPosition() updateEditPosition()
} }
@ -298,11 +310,9 @@ Rectangle {
} }
function updateTableItem(){ function updateTableItem(){
var columnModel = control.columnSource[column] var columnModel = control.columnSource[column]
if(columnModel.x !== item_table_mouse.x || columnModel.y !== item_table_mouse.y){ columnModel.x = item_table_mouse.x
columnModel.x = item_table_mouse.x columnModel.y = item_table_mouse.y
columnModel.y = item_table_mouse.y d.tableItemLayout(column)
d.tableItemLayout(column)
}
} }
Rectangle{ Rectangle{
anchors.fill: parent anchors.fill: parent
@ -342,7 +352,6 @@ Rectangle {
} }
FluLoader{ FluLoader{
id: item_table_loader id: item_table_loader
property var tableView: control
property var model: item_table_mouse._model property var model: item_table_mouse._model
property var display: rowModel[columnModel.dataIndex] property var display: rowModel[columnModel.dataIndex]
property var rowModel : model.rowModel property var rowModel : model.rowModel
@ -436,6 +445,10 @@ Rectangle {
} }
} }
onWidthChanged:{
table_view.forceLayout()
}
MouseArea{ MouseArea{
id:layout_mouse_table id:layout_mouse_table
hoverEnabled: true hoverEnabled: true
@ -466,9 +479,6 @@ Rectangle {
table_view.flick(0,1) table_view.flick(0,1)
} }
delegate: com_table_delegate delegate: com_table_delegate
onWidthChanged: {
Qt.callLater(forceLayout)
}
} }
} }
@ -945,18 +955,18 @@ Rectangle {
target: d target: d
function onTableItemLayout(column){ function onTableItemLayout(column){
if(item_layout_frozen._index === column){ if(item_layout_frozen._index === column){
Qt.callLater(updateLayout) updateLayout()
} }
} }
} }
Connections{ Connections{
target: table_view target: table_view
function onContentXChanged(){ function onContentXChanged(){
Qt.callLater(updateLayout) updateLayout()
} }
} }
function updateLayout(){ function updateLayout(){
width = Qt.binding(() => table_view.columnWidthProvider(_index)) width = table_view.columnWidthProvider(_index)
x = Qt.binding(function(){ x = Qt.binding(function(){
var minX = 0 var minX = 0
var maxX = table_view.width-width var maxX = table_view.width-width

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

@ -266,18 +266,30 @@ Rectangle {
d.rowHoverIndex = row d.rowHoverIndex = row
} }
onWidthChanged: { onWidthChanged: {
updatePosition() if(editVisible){
updateEditPosition()
}
if(isMainTable){
updateTableItem()
}
} }
onHeightChanged: { onHeightChanged: {
updatePosition() if(editVisible){
updateEditPosition()
}
if(isMainTable){
updateTableItem()
}
} }
onXChanged: { onXChanged: {
updatePosition() if(editVisible){
updateEditPosition()
}
if(isMainTable){
updateTableItem()
}
} }
onYChanged: { onYChanged: {
updatePosition()
}
function updatePosition(){
if(editVisible){ if(editVisible){
updateEditPosition() updateEditPosition()
} }
@ -298,11 +310,9 @@ Rectangle {
} }
function updateTableItem(){ function updateTableItem(){
var columnModel = control.columnSource[column] var columnModel = control.columnSource[column]
if(columnModel.x !== item_table_mouse.x || columnModel.y !== item_table_mouse.y){ columnModel.x = item_table_mouse.x
columnModel.x = item_table_mouse.x columnModel.y = item_table_mouse.y
columnModel.y = item_table_mouse.y d.tableItemLayout(column)
d.tableItemLayout(column)
}
} }
Rectangle{ Rectangle{
anchors.fill: parent anchors.fill: parent
@ -342,7 +352,6 @@ Rectangle {
} }
FluLoader{ FluLoader{
id: item_table_loader id: item_table_loader
property var tableView: control
property var model: item_table_mouse._model property var model: item_table_mouse._model
property var display: rowModel[columnModel.dataIndex] property var display: rowModel[columnModel.dataIndex]
property var rowModel : model.rowModel property var rowModel : model.rowModel
@ -436,6 +445,10 @@ Rectangle {
} }
} }
onWidthChanged:{
table_view.forceLayout()
}
MouseArea{ MouseArea{
id:layout_mouse_table id:layout_mouse_table
hoverEnabled: true hoverEnabled: true
@ -466,9 +479,6 @@ Rectangle {
table_view.flick(0,1) table_view.flick(0,1)
} }
delegate: com_table_delegate delegate: com_table_delegate
onWidthChanged: {
Qt.callLater(forceLayout)
}
} }
} }
@ -945,18 +955,18 @@ Rectangle {
target: d target: d
function onTableItemLayout(column){ function onTableItemLayout(column){
if(item_layout_frozen._index === column){ if(item_layout_frozen._index === column){
Qt.callLater(updateLayout) updateLayout()
} }
} }
} }
Connections{ Connections{
target: table_view target: table_view
function onContentXChanged(){ function onContentXChanged(){
Qt.callLater(updateLayout) updateLayout()
} }
} }
function updateLayout(){ function updateLayout(){
width = Qt.binding(() => table_view.columnWidthProvider(_index)) width = table_view.columnWidthProvider(_index)
x = Qt.binding(function(){ x = Qt.binding(function(){
var minX = 0 var minX = 0
var maxX = table_view.width-width var maxX = table_view.width-width