diff --git a/README.md b/README.md index 0bb167c..e4f869a 100644 --- a/README.md +++ b/README.md @@ -91,4 +91,6 @@ ## 多窗口路由跳转 -![](doc/preview/multiwindow.png) \ No newline at end of file +![](doc/preview/multiwindow.png) + +### ⚡ Visitor count ![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg) \ No newline at end of file diff --git a/example/T_ColorPicker.qml b/example/T_ColorPicker.qml index 1ba0aa7..6c3d736 100644 --- a/example/T_ColorPicker.qml +++ b/example/T_ColorPicker.qml @@ -20,7 +20,7 @@ FluScrollablePage{ left:parent.left } FluText{ - text:"此颜色组件是Github上大佬封装的" + text:"此颜色组件是Github上的开源项目" } FluTextButton{ leftPadding: 0 diff --git a/src/controls/FluAppBar.qml b/src/controls/FluAppBar.qml index 3fa088a..749e04d 100644 --- a/src/controls/FluAppBar.qml +++ b/src/controls/FluAppBar.qml @@ -49,6 +49,8 @@ Rectangle{ } function toggleMaximized() { + if(!resizable) + return if (window.visibility === Window.Maximized) { window.showNormal(); } else { diff --git a/src/controls/FluCarousel.qml b/src/controls/FluCarousel.qml index c521386..b691f56 100644 --- a/src/controls/FluCarousel.qml +++ b/src/controls/FluCarousel.qml @@ -46,6 +46,7 @@ Item { Image { anchors.fill: parent source: model.url + asynchronous: true fillMode:Image.PreserveAspectCrop } } diff --git a/src/controls/FluTreeView.qml b/src/controls/FluTreeView.qml index aa25e02..0179445 100644 --- a/src/controls/FluTreeView.qml +++ b/src/controls/FluTreeView.qml @@ -8,21 +8,18 @@ import QtGraphicalEffects 1.15 Item { id:root + property int selectionMode: FluTreeView.None + property var currentElement + property var currentParentElement + property var rootModel: tree_model.get(0).items + signal itemClicked(var item) + enum TreeViewSelectionMode { None, Single, Multiple } - property int selectionMode: FluTreeView.None - - property var currentElement - property var currentParentElement - - property var rootModel: tree_model.get(0).items - - signal itemClicked(var item) - ListModel{ id:tree_model ListElement{ diff --git a/src/controls/FluWindow.qml b/src/controls/FluWindow.qml index 595dfba..cef9ccd 100644 --- a/src/controls/FluWindow.qml +++ b/src/controls/FluWindow.qml @@ -74,7 +74,22 @@ Item { } Component.onCompleted: { + updateWindowSize() + } + Connections{ + target: FluTheme + function onIsFramelessChanged(){ + updateWindowSize() + } + } + + function updateWindowSize(){ + if(FluTheme.isFrameless){ + height = height + 34 + }else{ + height = height - 34 + } } Connections{