From fce7f8c40cfe1030969c689aa57d92724a22656b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?=
<zhuzichu520@outlook.com>
Date: Mon, 26 Feb 2024 23:12:12 +0800
Subject: [PATCH] update
---
.../FluentUI/Controls/ColorPicker/ColorPicker.qml | 3 +--
src/Qt5/imports/FluentUI/Controls/FluTimeline.qml | 14 ++++++++++++--
.../FluentUI/Controls/ColorPicker/ColorPicker.qml | 4 +---
src/Qt6/imports/FluentUI/Controls/FluTimeline.qml | 14 ++++++++++++--
4 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/Qt5/imports/FluentUI/Controls/ColorPicker/ColorPicker.qml b/src/Qt5/imports/FluentUI/Controls/ColorPicker/ColorPicker.qml
index be3e770e..af86ceb4 100644
--- a/src/Qt5/imports/FluentUI/Controls/ColorPicker/ColorPicker.qml
+++ b/src/Qt5/imports/FluentUI/Controls/ColorPicker/ColorPicker.qml
@@ -3,7 +3,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import "Content"
-Rectangle {
+Item {
id: colorPicker
property color colorValue: "transparent"
property bool enableAlphaChannel: true
@@ -18,7 +18,6 @@ Rectangle {
implicitWidth: picker.implicitWidth
implicitHeight: picker.implicitHeight
- color: "#00000000"
clip: true
RowLayout {
diff --git a/src/Qt5/imports/FluentUI/Controls/FluTimeline.qml b/src/Qt5/imports/FluentUI/Controls/FluTimeline.qml
index cd19b9a6..a4a3b564 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluTimeline.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTimeline.qml
@@ -39,7 +39,12 @@ Item{
Rectangle{
id:rect_line
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
visible: repeater.count!==0
state: d.stateName
@@ -92,7 +97,12 @@ Item{
FluText{
wrapMode: Text.WrapAnywhere
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
- text: modelData.lable
+ text: {
+ if(modelData.lable){
+ return modelData.lable
+ }
+ return ""
+ }
color: FluTheme.primaryColor
}
}
diff --git a/src/Qt6/imports/FluentUI/Controls/ColorPicker/ColorPicker.qml b/src/Qt6/imports/FluentUI/Controls/ColorPicker/ColorPicker.qml
index 055fe7fc..cec8b7c1 100644
--- a/src/Qt6/imports/FluentUI/Controls/ColorPicker/ColorPicker.qml
+++ b/src/Qt6/imports/FluentUI/Controls/ColorPicker/ColorPicker.qml
@@ -3,7 +3,7 @@ import QtQuick.Layouts
import QtQuick.Controls
import "Content"
-Rectangle {
+Item {
id: colorPicker
property color colorValue: "transparent"
property bool enableAlphaChannel: true
@@ -18,7 +18,6 @@ Rectangle {
implicitWidth: picker.implicitWidth
implicitHeight: picker.implicitHeight
- color: "#00000000"
clip: true
RowLayout {
@@ -30,7 +29,6 @@ Rectangle {
anchors.bottom: parent.bottom
spacing: 0
-
SBPicker {
id: sbPicker
Layout.fillWidth: true
diff --git a/src/Qt6/imports/FluentUI/Controls/FluTimeline.qml b/src/Qt6/imports/FluentUI/Controls/FluTimeline.qml
index 88e1d84b..6a42bf9c 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluTimeline.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTimeline.qml
@@ -39,7 +39,12 @@ Item{
Rectangle{
id:rect_line
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
visible: repeater.count!==0
state: d.stateName
@@ -92,7 +97,12 @@ Item{
FluText{
wrapMode: Text.WrapAnywhere
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
- text: modelData.lable
+ text: {
+ if(modelData.lable){
+ return modelData.lable
+ }
+ return ""
+ }
color: FluTheme.primaryColor
}
}