amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-02-02 19:27:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2024-02-26 23:12:12 +08:00
parent 50f7071172
commit fce7f8c40c
4 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Qt5/imports/FluentUI/Controls/ColorPicker/ColorPicker.qml
View File

@ -3,7 +3,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import "Content" import "Content"
Rectangle { Item {
id: colorPicker id: colorPicker
property color colorValue: "transparent" property color colorValue: "transparent"
property bool enableAlphaChannel: true property bool enableAlphaChannel: true
@ -18,7 +18,6 @@ Rectangle {
implicitWidth: picker.implicitWidth implicitWidth: picker.implicitWidth
implicitHeight: picker.implicitHeight implicitHeight: picker.implicitHeight
color: "#00000000"
clip: true clip: true
RowLayout { RowLayout {

14
src/Qt5/imports/FluentUI/Controls/FluTimeline.qml
View File

@ -39,7 +39,12 @@ Item{
Rectangle{ Rectangle{
id:rect_line id:rect_line
color: control.lineColor color: control.lineColor
height: parent.height height: {
if(repeater.count===0){
return parent.height
}
return parent.height - layout_column.children[repeater.count-1].height
}
width: 2 width: 2
visible: repeater.count!==0 visible: repeater.count!==0
state: d.stateName state: d.stateName
@ -92,7 +97,12 @@ Item{
FluText{ FluText{
wrapMode: Text.WrapAnywhere wrapMode: Text.WrapAnywhere
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
text: modelData.lable text: {
if(modelData.lable){
return modelData.lable
}
return ""
}
color: FluTheme.primaryColor color: FluTheme.primaryColor
} }
} }

4
src/Qt6/imports/FluentUI/Controls/ColorPicker/ColorPicker.qml
View File

@ -3,7 +3,7 @@ import QtQuick.Layouts
import QtQuick.Controls import QtQuick.Controls
import "Content" import "Content"
Rectangle { Item {
id: colorPicker id: colorPicker
property color colorValue: "transparent" property color colorValue: "transparent"
property bool enableAlphaChannel: true property bool enableAlphaChannel: true
@ -18,7 +18,6 @@ Rectangle {
implicitWidth: picker.implicitWidth implicitWidth: picker.implicitWidth
implicitHeight: picker.implicitHeight implicitHeight: picker.implicitHeight
color: "#00000000"
clip: true clip: true
RowLayout { RowLayout {
@ -30,7 +29,6 @@ Rectangle {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
spacing: 0 spacing: 0
SBPicker { SBPicker {
id: sbPicker id: sbPicker
Layout.fillWidth: true Layout.fillWidth: true

14
src/Qt6/imports/FluentUI/Controls/FluTimeline.qml
View File

@ -39,7 +39,12 @@ Item{
Rectangle{ Rectangle{
id:rect_line id:rect_line
color: control.lineColor color: control.lineColor
height: parent.height height: {
if(repeater.count===0){
return parent.height
}
return parent.height - layout_column.children[repeater.count-1].height
}
width: 2 width: 2
visible: repeater.count!==0 visible: repeater.count!==0
state: d.stateName state: d.stateName
@ -92,7 +97,12 @@ Item{
FluText{ FluText{
wrapMode: Text.WrapAnywhere wrapMode: Text.WrapAnywhere
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
text: modelData.lable text: {
if(modelData.lable){
return modelData.lable
}
return ""
}
color: FluTheme.primaryColor color: FluTheme.primaryColor
} }
} }