From 6dd859dd1d1cf6308cdfbbe575b129ffacc3bf42 Mon Sep 17 00:00:00 2001 From: zhuzihcu Date: Wed, 19 Apr 2023 17:25:46 +0800 Subject: [PATCH] update --- example/T_Badge.qml | 1 + example/T_Buttons.qml | 8 ++++++++ example/T_CalendarPicker.qml | 2 ++ example/T_Carousel.qml | 1 + example/T_CheckBox.qml | 1 + example/T_ColorPicker.qml | 2 ++ example/T_DatePicker.qml | 2 ++ example/T_Dialog.qml | 1 + example/T_Expander.qml | 6 +++--- example/T_FlipView.qml | 2 ++ example/T_InfoBar.qml | 1 + example/T_MediaPlayer.qml | 1 + example/T_Menu.qml | 1 + example/T_MultiWindow.qml | 3 +++ example/T_Pivot.qml | 1 + example/T_Progress.qml | 1 + example/T_RatingControl.qml | 1 + example/T_Rectangle.qml | 1 + example/T_Settings.qml | 2 +- example/T_Slider.qml | 2 ++ example/T_StatusView.qml | 1 + example/T_TabView.qml | 1 + example/T_TextBox.qml | 3 +++ example/T_Theme.qml | 4 ++-- example/T_TimePicker.qml | 2 ++ example/T_ToggleSwitch.qml | 1 + example/T_Tooltip.qml | 1 + example/T_TreeView.qml | 1 + src/controls/FluExpander.qml | 1 + 29 files changed, 49 insertions(+), 6 deletions(-) diff --git a/example/T_Badge.qml b/example/T_Badge.qml index a8ddb8b9..dcac5553 100644 --- a/example/T_Badge.qml +++ b/example/T_Badge.qml @@ -103,6 +103,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'Rectangle{ width: 40 height: 40 diff --git a/example/T_Buttons.qml b/example/T_Buttons.qml index 8f30eb75..d1fdbdf7 100644 --- a/example/T_Buttons.qml +++ b/example/T_Buttons.qml @@ -51,6 +51,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluTextButton{ text:"Text Button" onClicked: { @@ -92,6 +93,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluButton{ text:"Standard Button" onClicked: { @@ -133,6 +135,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluFilledButton{ text:"Filled Button" onClicked: { @@ -174,6 +177,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluToggleButton{ text:"Toggle Button" onClicked: { @@ -216,6 +220,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluIconButton{ iconSource:FluentIcons.ChromeCloseContrast onClicked: { @@ -266,6 +271,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluDropDownButton{ text:"DropDownButton" items:[ @@ -327,6 +333,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluRadioButton{ selected:true text:"Text Button" @@ -365,6 +372,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluCheckBox{ text:"Check Box" }' diff --git a/example/T_CalendarPicker.qml b/example/T_CalendarPicker.qml index 176f3ed1..ca516259 100644 --- a/example/T_CalendarPicker.qml +++ b/example/T_CalendarPicker.qml @@ -23,6 +23,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluCalendarView{ }' @@ -44,6 +45,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluCalendarPicker{ }' diff --git a/example/T_Carousel.qml b/example/T_Carousel.qml index ab12fa9c..0bd7c53d 100644 --- a/example/T_Carousel.qml +++ b/example/T_Carousel.qml @@ -39,6 +39,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluCarousel{ width: 400 height: 300 diff --git a/example/T_CheckBox.qml b/example/T_CheckBox.qml index 27317d1b..b9aa3343 100644 --- a/example/T_CheckBox.qml +++ b/example/T_CheckBox.qml @@ -30,6 +30,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluCheckBox{ text:"Text" }' diff --git a/example/T_ColorPicker.qml b/example/T_ColorPicker.qml index a1928c62..7595d1f5 100644 --- a/example/T_ColorPicker.qml +++ b/example/T_ColorPicker.qml @@ -41,6 +41,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluColorView{ }' @@ -64,6 +65,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluColorPicker{ }' diff --git a/example/T_DatePicker.qml b/example/T_DatePicker.qml index 91dc5bb4..bf557b83 100644 --- a/example/T_DatePicker.qml +++ b/example/T_DatePicker.qml @@ -32,6 +32,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluDatePicker{ }' @@ -59,6 +60,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluDatePicker{ showYear:false }' diff --git a/example/T_Dialog.qml b/example/T_Dialog.qml index deffd0e3..f6d5960d 100644 --- a/example/T_Dialog.qml +++ b/example/T_Dialog.qml @@ -29,6 +29,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluContentDialog{ id:dialog title:"友情提示" diff --git a/example/T_Expander.qml b/example/T_Expander.qml index d2ccdf9e..3bfed3c4 100644 --- a/example/T_Expander.qml +++ b/example/T_Expander.qml @@ -15,14 +15,14 @@ FluScrollablePage{ FluArea{ Layout.fillWidth: true - height: layout_column.height+40 + height: layout_column.height+20 paddings: 10 Layout.topMargin: 20 Column{ id:layout_column spacing: 15 anchors{ - verticalCenter: parent.verticalCenter + top:parent.top left:parent.left } @@ -77,12 +77,12 @@ FluScrollablePage{ } } } - } } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluExpander{ headerText:"打开一个单选框" Item{ diff --git a/example/T_FlipView.qml b/example/T_FlipView.qml index c81b5790..2577407d 100644 --- a/example/T_FlipView.qml +++ b/example/T_FlipView.qml @@ -44,6 +44,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluFlipView{ Image{ source: "qrc:/res/image/banner_1.jpg" @@ -97,6 +98,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluFlipView{ vertical:true Image{ diff --git a/example/T_InfoBar.qml b/example/T_InfoBar.qml index e07b8d4f..15c138e5 100644 --- a/example/T_InfoBar.qml +++ b/example/T_InfoBar.qml @@ -52,6 +52,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'showInfo("这是一个Info样式的InfoBar") showWarning("这是一个Warning样式的InfoBar") diff --git a/example/T_MediaPlayer.qml b/example/T_MediaPlayer.qml index bd6f743e..090686d0 100644 --- a/example/T_MediaPlayer.qml +++ b/example/T_MediaPlayer.qml @@ -38,6 +38,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluMediaPlayer{ id:player source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4" diff --git a/example/T_Menu.qml b/example/T_Menu.qml index 7527d3cf..d7621ebf 100644 --- a/example/T_Menu.qml +++ b/example/T_Menu.qml @@ -53,6 +53,7 @@ FluScrollablePage{ CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluMenu{ id:menu FluMenuItem:{ diff --git a/example/T_MultiWindow.qml b/example/T_MultiWindow.qml index ecffbdd1..2641f70b 100644 --- a/example/T_MultiWindow.qml +++ b/example/T_MultiWindow.qml @@ -95,6 +95,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluWindow{ //launchMode: FluWindow.Standard //launchMode: FluWindow.SingleTask @@ -128,6 +129,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluButton{ text:"点击跳转" onClicked: { @@ -165,6 +167,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'property var loginPageRegister: registerForPageResult("/login") Connections{ diff --git a/example/T_Pivot.qml b/example/T_Pivot.qml index 0da0daeb..6d3432d1 100644 --- a/example/T_Pivot.qml +++ b/example/T_Pivot.qml @@ -50,6 +50,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluPivot{ anchors.fill: parent FluPivotItem:{ diff --git a/example/T_Progress.qml b/example/T_Progress.qml index b6888569..642e4eed 100644 --- a/example/T_Progress.qml +++ b/example/T_Progress.qml @@ -47,6 +47,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluProgressBar{ } diff --git a/example/T_RatingControl.qml b/example/T_RatingControl.qml index 6e75b0a8..7f833bed 100644 --- a/example/T_RatingControl.qml +++ b/example/T_RatingControl.qml @@ -34,6 +34,7 @@ FluScrollablePage{ CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluRatingControl{ }' diff --git a/example/T_Rectangle.qml b/example/T_Rectangle.qml index 38793de0..1b47baa4 100644 --- a/example/T_Rectangle.qml +++ b/example/T_Rectangle.qml @@ -134,6 +134,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluRectangle{ radius: [25,25,25,25] width: 50 diff --git a/example/T_Settings.qml b/example/T_Settings.qml index a445e71e..cf54b60f 100644 --- a/example/T_Settings.qml +++ b/example/T_Settings.qml @@ -51,7 +51,7 @@ FluScrollablePage{ FluArea{ Layout.fillWidth: true Layout.topMargin: 20 - height: 168 + height: 80 paddings: 10 ColumnLayout{ diff --git a/example/T_Slider.qml b/example/T_Slider.qml index 03323ade..6668d771 100644 --- a/example/T_Slider.qml +++ b/example/T_Slider.qml @@ -25,6 +25,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluSlider{ value:50 }' @@ -46,6 +47,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluSlider{ vertical:true value:50 diff --git a/example/T_StatusView.qml b/example/T_StatusView.qml index da87dfe8..9040cbaa 100644 --- a/example/T_StatusView.qml +++ b/example/T_StatusView.qml @@ -78,6 +78,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluStatusView{ anchors.fill: parent statusMode: FluStatusView.Loading diff --git a/example/T_TabView.qml b/example/T_TabView.qml index 57b845cd..97ab4160 100644 --- a/example/T_TabView.qml +++ b/example/T_TabView.qml @@ -113,6 +113,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluTabView{ anchors.fill: parent Component.onCompleted: { diff --git a/example/T_TextBox.qml b/example/T_TextBox.qml index 66f55731..def000a7 100644 --- a/example/T_TextBox.qml +++ b/example/T_TextBox.qml @@ -45,6 +45,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluTextBox{ placeholderText:"单行输入框" }' @@ -83,6 +84,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluMultilineTextBox{ placeholderText:"多行输入框" }' @@ -122,6 +124,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluAutoSuggestBox{ placeholderText:"AutoSuggestBox" }' diff --git a/example/T_Theme.qml b/example/T_Theme.qml index b85f6b5c..f0405e43 100644 --- a/example/T_Theme.qml +++ b/example/T_Theme.qml @@ -76,12 +76,12 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluTheme.primaryColor = FluColors.Orange FluTheme.dark = true -FluTheme.nativeText = true -' +FluTheme.nativeText = true' } diff --git a/example/T_TimePicker.qml b/example/T_TimePicker.qml index d1bd6715..ea647d1f 100644 --- a/example/T_TimePicker.qml +++ b/example/T_TimePicker.qml @@ -37,6 +37,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluTimePicker{ }' @@ -67,6 +68,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluTimePicker{ hourFormat:FluTimePicker.HH }' diff --git a/example/T_ToggleSwitch.qml b/example/T_ToggleSwitch.qml index c6a057ea..0277a669 100644 --- a/example/T_ToggleSwitch.qml +++ b/example/T_ToggleSwitch.qml @@ -30,6 +30,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluToggleSwitch{ text:"Text" }' diff --git a/example/T_Tooltip.qml b/example/T_Tooltip.qml index 6c3d32a0..504e3a24 100644 --- a/example/T_Tooltip.qml +++ b/example/T_Tooltip.qml @@ -45,6 +45,7 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluIconButton{ iconSource:FluentIcons.ChromeCloseContrast iconSize: 15 diff --git a/example/T_TreeView.qml b/example/T_TreeView.qml index c2ed337e..f3b26988 100644 --- a/example/T_TreeView.qml +++ b/example/T_TreeView.qml @@ -142,6 +142,7 @@ FluScrollablePage { CodeExpander{ Layout.fillWidth: true + Layout.topMargin: -1 code:'FluTreeView{ id:tree_view width:240 diff --git a/src/controls/FluExpander.qml b/src/controls/FluExpander.qml index 36765be7..f8350cb2 100644 --- a/src/controls/FluExpander.qml +++ b/src/controls/FluExpander.qml @@ -76,6 +76,7 @@ Item { clip: true anchors{ top: layout_header.bottom + topMargin: -1 left: layout_header.left } radius: 4