From e1096b8e221b7328e1209fe11e21f0aeed2a9cc0 Mon Sep 17 00:00:00 2001 From: zhuzichu Date: Sun, 25 Jun 2023 19:01:22 +0800 Subject: [PATCH] update --- example/qml/App.qml | 3 ++- example/qml/window/MainWindow.qml | 1 + src/imports/FluentUI/Controls/FluComboBox.qml | 5 ++++- src/imports/FluentUI/Controls/FluCopyableText.qml | 1 + src/imports/FluentUI/Controls/FluRemoteLoader.qml | 7 ++++++- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/example/qml/App.qml b/example/qml/App.qml index 8bddd670..6b710ff7 100644 --- a/example/qml/App.qml +++ b/example/qml/App.qml @@ -5,7 +5,8 @@ import QtQuick.Layouts import FluentUI Window { - id:app + id: app + flags: Qt.SplashScreen Component.onCompleted: { FluApp.init(app) FluTheme.darkMode = FluDarkMode.System diff --git a/example/qml/window/MainWindow.qml b/example/qml/window/MainWindow.qml index b4b0c109..3fa3588e 100644 --- a/example/qml/window/MainWindow.qml +++ b/example/qml/window/MainWindow.qml @@ -134,6 +134,7 @@ CustomWindow { FluRemoteLoader{ id:loader + lazy: true anchors.fill: parent // source: "http://localhost:9000/RemoteComponent.qml" source: "https://zhu-zichu.gitee.io/RemoteComponent.qml" diff --git a/src/imports/FluentUI/Controls/FluComboBox.qml b/src/imports/FluentUI/Controls/FluComboBox.qml index 3e16553d..3d0e3496 100644 --- a/src/imports/FluentUI/Controls/FluComboBox.qml +++ b/src/imports/FluentUI/Controls/FluComboBox.qml @@ -44,6 +44,7 @@ ComboBox { bottomPadding: 6 - control.padding renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering selectionColor: FluTheme.primaryColor.lightest + selectedTextColor: control.palette.highlightedText text: control.editable ? control.editText : control.displayText enabled: control.editable autoScroll: control.editable @@ -57,12 +58,14 @@ ComboBox { leftInset:1 topInset:1 bottomInset:1 - focus: true rightInset:1 background: FluTextBoxBackground{ border.width: 0 inputItem: contentItem } + Component.onCompleted: { + focus = true + } } background: Rectangle { diff --git a/src/imports/FluentUI/Controls/FluCopyableText.qml b/src/imports/FluentUI/Controls/FluCopyableText.qml index 14d1392d..9d81dda3 100644 --- a/src/imports/FluentUI/Controls/FluCopyableText.qml +++ b/src/imports/FluentUI/Controls/FluCopyableText.qml @@ -14,6 +14,7 @@ TextEdit { leftPadding: 0 rightPadding: 0 topPadding: 0 + selectedTextColor: FluColors.Grey220 bottomPadding: 0 selectionColor: FluTheme.primaryColor.lightest font:FluTextStyle.Body diff --git a/src/imports/FluentUI/Controls/FluRemoteLoader.qml b/src/imports/FluentUI/Controls/FluRemoteLoader.qml index a50eedcd..759d78f7 100644 --- a/src/imports/FluentUI/Controls/FluRemoteLoader.qml +++ b/src/imports/FluentUI/Controls/FluRemoteLoader.qml @@ -4,15 +4,20 @@ import FluentUI FluStatusView { property url source: "" + property bool lazy: false color:"transparent" id:control onErrorClicked: { reload() } + Component.onCompleted: { + if(!lazy){ + loader.source = control.source + } + } Loader{ id:loader anchors.fill: parent - source: control.source asynchronous: true onStatusChanged: { if(status === Loader.Error){