From ac6351445119b3502733175b0739a7f246239e08 Mon Sep 17 00:00:00 2001 From: zhuzichu Date: Thu, 19 Oct 2023 15:25:07 +0800 Subject: [PATCH] update --- example/qml-Qt6/global/ItemsFooter.qml | 3 +- example/qml-Qt6/global/ItemsOriginal.qml | 51 +------------------ example/qml/global/ItemsFooter.qml | 2 - example/qml/global/ItemsOriginal.qml | 50 ------------------ framelesshelper | 2 +- .../FluentUI/Controls/FluNavigationView.qml | 25 --------- .../imports/FluentUI/Controls/FluPaneItem.qml | 2 - .../FluentUI/Controls/FluNavigationView.qml | 27 +--------- .../imports/FluentUI/Controls/FluPaneItem.qml | 1 - 9 files changed, 4 insertions(+), 159 deletions(-) diff --git a/example/qml-Qt6/global/ItemsFooter.qml b/example/qml-Qt6/global/ItemsFooter.qml index e17794ee..0e3c1460 100644 --- a/example/qml-Qt6/global/ItemsFooter.qml +++ b/example/qml-Qt6/global/ItemsFooter.qml @@ -14,7 +14,6 @@ FluObject{ FluPaneItem{ title:Lang.about icon:FluentIcons.Contact - onDropped: { FluApp.navigate("/about") } onTapListener:function(){ FluApp.navigate("/about") } @@ -24,10 +23,10 @@ FluObject{ title:Lang.settings icon:FluentIcons.Settings url:"qrc:/example/qml/page/T_Settings.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } } + diff --git a/example/qml-Qt6/global/ItemsOriginal.qml b/example/qml-Qt6/global/ItemsOriginal.qml index 1b6a0c1f..21b11314 100644 --- a/example/qml-Qt6/global/ItemsOriginal.qml +++ b/example/qml-Qt6/global/ItemsOriginal.qml @@ -22,7 +22,6 @@ FluObject{ } icon:FluentIcons.Home url:"qrc:/example/qml/page/T_Home.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ if(navigationView.getCurrentUrl()){ item_home.count = 0 @@ -78,7 +77,6 @@ FluObject{ recentlyUpdated:true desc:"A control that responds to user input and raisesa Click event." url:"qrc:/example/qml/page/T_Buttons.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ item_buttons.count = 0 navigationView.push(url) @@ -93,7 +91,6 @@ FluObject{ color: Qt.rgba(82/255,196/255,26/255,1) } url:"qrc:/example/qml/page/T_Text.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ item_text.count = 0 navigationView.push(url) @@ -102,7 +99,6 @@ FluObject{ FluPaneItem{ title:"Image" url:"qrc:/example/qml/page/T_Image.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -111,7 +107,6 @@ FluObject{ recentlyUpdated:true desc:"A control that lets the user select from a rangeof values by moving a Thumb control along atrack." url:"qrc:/example/qml/page/T_Slider.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -120,19 +115,16 @@ FluObject{ recentlyUpdated:true desc:"A control that a user can select or clear." url:"qrc:/example/qml/page/T_CheckBox.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"RadioButton" url:"qrc:/example/qml/page/T_RadioButton.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"ToggleSwitch" url:"qrc:/example/qml/page/T_ToggleSwitch.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -148,31 +140,26 @@ FluObject{ FluPaneItem{ title:"TextBox" url:"qrc:/example/qml/page/T_TextBox.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"TimePicker" url:"qrc:/example/qml/page/T_TimePicker.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"DatePicker" url:"qrc:/example/qml/page/T_DatePicker.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"CalendarPicker" url:"qrc:/example/qml/page/T_CalendarPicker.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"ColorPicker" url:"qrc:/example/qml/page/T_ColorPicker.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } } @@ -186,67 +173,56 @@ FluObject{ recentlyUpdated:true desc:"An inline message to display app-wide statuschange information." url:"qrc:/example/qml/page/T_InfoBar.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Progress" url:"qrc:/example/qml/page/T_Progress.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"RatingControl" url:"qrc:/example/qml/page/T_RatingControl.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Badge" url:"qrc:/example/qml/page/T_Badge.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Rectangle" url:"qrc:/example/qml/page/T_Rectangle.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Clip" url:"qrc:/example/qml/page/T_Clip.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"StatusView" url:"qrc:/example/qml/page/T_StatusView.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Carousel" url:"qrc:/example/qml/page/T_Carousel.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Expander" url:"qrc:/example/qml/page/T_Expander.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"StaggeredView" url:"qrc:/example/qml/page/T_StaggeredView.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Watermark" url:"qrc:/example/qml/page/T_Watermark.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } } @@ -257,7 +233,6 @@ FluObject{ FluPaneItem{ title:"Dialog" url:"qrc:/example/qml/page/T_Dialog.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -269,7 +244,6 @@ FluObject{ color: Qt.rgba(250/255,173/255,20/255,1) } url:"qrc:/example/qml/page/T_ComboBox.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ item_combobox.count = 0 navigationView.push("qrc:/example/qml/page/T_ComboBox.qml") @@ -278,13 +252,11 @@ FluObject{ FluPaneItem{ title:"Tooltip" url:"qrc:/example/qml/page/T_Tooltip.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Menu" url:"qrc:/example/qml/page/T_Menu.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } } @@ -299,13 +271,11 @@ FluObject{ order:3 desc:"Presents information from different sources in atabbed view." url:"qrc:/example/qml/page/T_Pivot.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"BreadcrumbBar" url:"qrc:/example/qml/page/T_BreadcrumbBar.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -315,13 +285,11 @@ FluObject{ order:1 desc:"A control that displays a collection of tabs thatcan be used to display several documents." url:"qrc:/example/qml/page/T_TabView.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"TreeView" url:"qrc:/example/qml/page/T_TreeView.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -331,19 +299,16 @@ FluObject{ order:4 desc:"The TableView control provides a flexible way to display a collection of data in rows and columns" url:"qrc:/example/qml/page/T_TableView.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Pagination" url:"qrc:/example/qml/page/T_Pagination.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"MultiWindow" url:"qrc:/example/qml/page/T_MultiWindow.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -353,7 +318,6 @@ FluObject{ order:2 desc:"Presents a collection of items that the user canflip through, one item at a time." url:"qrc:/example/qml/page/T_FlipView.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } } @@ -364,25 +328,21 @@ FluObject{ FluPaneItem{ title:"Acrylic" url:"qrc:/example/qml/page/T_Acrylic.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Theme" url:"qrc:/example/qml/page/T_Theme.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Typography" url:"qrc:/example/qml/page/T_Typography.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Awesome" url:"qrc:/example/qml/page/T_Awesome.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } } @@ -398,43 +358,36 @@ FluObject{ FluPaneItem{ title:"QRCode" url:"qrc:/example/qml/page/T_QRCode.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Tour" url:"qrc:/example/qml/page/T_Tour.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Timeline" url:"qrc:/example/qml/page/T_Timeline.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Screenshot(Todo)" url:"qrc:/example/qml/page/T_Screenshot.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Captcha" url:"qrc:/example/qml/page/T_Captcha.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Chart" url:"qrc:/example/qml/page/T_Chart.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Http" url:"qrc:/example/qml/page/T_Http.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -446,7 +399,6 @@ FluObject{ color: Qt.rgba(82/255,196/255,26/255,1) } url:"qrc:/example/qml/page/T_RemoteLoader.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ item_other.count = 0 navigationView.push("qrc:/example/qml/page/T_RemoteLoader.qml") @@ -457,12 +409,10 @@ FluObject{ onTapListener:function(){ FluApp.navigate("/hotload") } - onDropped:{ FluApp.navigate("/hotload") } } FluPaneItem{ title:"3D" url:"qrc:/example/qml/page/T_3D.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } } @@ -524,3 +474,4 @@ FluObject{ } } + diff --git a/example/qml/global/ItemsFooter.qml b/example/qml/global/ItemsFooter.qml index e93ddcb8..0b5b19ba 100644 --- a/example/qml/global/ItemsFooter.qml +++ b/example/qml/global/ItemsFooter.qml @@ -14,7 +14,6 @@ FluObject{ FluPaneItem{ title:Lang.about icon:FluentIcons.Contact - onDropped: { FluApp.navigate("/about") } onTapListener:function(){ FluApp.navigate("/about") } @@ -24,7 +23,6 @@ FluObject{ title:Lang.settings icon:FluentIcons.Settings url:"qrc:/example/qml/page/T_Settings.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } diff --git a/example/qml/global/ItemsOriginal.qml b/example/qml/global/ItemsOriginal.qml index 3ddeab46..c1ffd216 100644 --- a/example/qml/global/ItemsOriginal.qml +++ b/example/qml/global/ItemsOriginal.qml @@ -22,7 +22,6 @@ FluObject{ } icon:FluentIcons.Home url:"qrc:/example/qml/page/T_Home.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ if(navigationView.getCurrentUrl()){ item_home.count = 0 @@ -78,7 +77,6 @@ FluObject{ recentlyUpdated:true desc:"A control that responds to user input and raisesa Click event." url:"qrc:/example/qml/page/T_Buttons.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ item_buttons.count = 0 navigationView.push(url) @@ -93,7 +91,6 @@ FluObject{ color: Qt.rgba(82/255,196/255,26/255,1) } url:"qrc:/example/qml/page/T_Text.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ item_text.count = 0 navigationView.push(url) @@ -102,7 +99,6 @@ FluObject{ FluPaneItem{ title:"Image" url:"qrc:/example/qml/page/T_Image.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -111,7 +107,6 @@ FluObject{ recentlyUpdated:true desc:"A control that lets the user select from a rangeof values by moving a Thumb control along atrack." url:"qrc:/example/qml/page/T_Slider.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -120,19 +115,16 @@ FluObject{ recentlyUpdated:true desc:"A control that a user can select or clear." url:"qrc:/example/qml/page/T_CheckBox.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"RadioButton" url:"qrc:/example/qml/page/T_RadioButton.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"ToggleSwitch" url:"qrc:/example/qml/page/T_ToggleSwitch.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -148,31 +140,26 @@ FluObject{ FluPaneItem{ title:"TextBox" url:"qrc:/example/qml/page/T_TextBox.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"TimePicker" url:"qrc:/example/qml/page/T_TimePicker.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"DatePicker" url:"qrc:/example/qml/page/T_DatePicker.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"CalendarPicker" url:"qrc:/example/qml/page/T_CalendarPicker.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"ColorPicker" url:"qrc:/example/qml/page/T_ColorPicker.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } } @@ -186,67 +173,56 @@ FluObject{ recentlyUpdated:true desc:"An inline message to display app-wide statuschange information." url:"qrc:/example/qml/page/T_InfoBar.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Progress" url:"qrc:/example/qml/page/T_Progress.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"RatingControl" url:"qrc:/example/qml/page/T_RatingControl.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Badge" url:"qrc:/example/qml/page/T_Badge.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Rectangle" url:"qrc:/example/qml/page/T_Rectangle.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Clip" url:"qrc:/example/qml/page/T_Clip.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"StatusView" url:"qrc:/example/qml/page/T_StatusView.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Carousel" url:"qrc:/example/qml/page/T_Carousel.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Expander" url:"qrc:/example/qml/page/T_Expander.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"StaggeredView" url:"qrc:/example/qml/page/T_StaggeredView.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Watermark" url:"qrc:/example/qml/page/T_Watermark.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } } @@ -257,7 +233,6 @@ FluObject{ FluPaneItem{ title:"Dialog" url:"qrc:/example/qml/page/T_Dialog.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -269,7 +244,6 @@ FluObject{ color: Qt.rgba(250/255,173/255,20/255,1) } url:"qrc:/example/qml/page/T_ComboBox.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ item_combobox.count = 0 navigationView.push("qrc:/example/qml/page/T_ComboBox.qml") @@ -278,13 +252,11 @@ FluObject{ FluPaneItem{ title:"Tooltip" url:"qrc:/example/qml/page/T_Tooltip.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Menu" url:"qrc:/example/qml/page/T_Menu.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } } @@ -299,13 +271,11 @@ FluObject{ order:3 desc:"Presents information from different sources in atabbed view." url:"qrc:/example/qml/page/T_Pivot.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"BreadcrumbBar" url:"qrc:/example/qml/page/T_BreadcrumbBar.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -315,13 +285,11 @@ FluObject{ order:1 desc:"A control that displays a collection of tabs thatcan be used to display several documents." url:"qrc:/example/qml/page/T_TabView.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"TreeView" url:"qrc:/example/qml/page/T_TreeView.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -331,19 +299,16 @@ FluObject{ order:4 desc:"The TableView control provides a flexible way to display a collection of data in rows and columns" url:"qrc:/example/qml/page/T_TableView.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Pagination" url:"qrc:/example/qml/page/T_Pagination.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"MultiWindow" url:"qrc:/example/qml/page/T_MultiWindow.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -353,7 +318,6 @@ FluObject{ order:2 desc:"Presents a collection of items that the user canflip through, one item at a time." url:"qrc:/example/qml/page/T_FlipView.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } } @@ -364,25 +328,21 @@ FluObject{ FluPaneItem{ title:"Acrylic" url:"qrc:/example/qml/page/T_Acrylic.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Theme" url:"qrc:/example/qml/page/T_Theme.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Typography" url:"qrc:/example/qml/page/T_Typography.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Awesome" url:"qrc:/example/qml/page/T_Awesome.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } } @@ -398,43 +358,36 @@ FluObject{ FluPaneItem{ title:"QRCode" url:"qrc:/example/qml/page/T_QRCode.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Tour" url:"qrc:/example/qml/page/T_Tour.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Timeline" url:"qrc:/example/qml/page/T_Timeline.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Screenshot(Todo)" url:"qrc:/example/qml/page/T_Screenshot.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Captcha" url:"qrc:/example/qml/page/T_Captcha.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Chart" url:"qrc:/example/qml/page/T_Chart.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ title:"Http" url:"qrc:/example/qml/page/T_Http.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } FluPaneItem{ @@ -446,7 +399,6 @@ FluObject{ color: Qt.rgba(82/255,196/255,26/255,1) } url:"qrc:/example/qml/page/T_RemoteLoader.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ item_other.count = 0 navigationView.push("qrc:/example/qml/page/T_RemoteLoader.qml") @@ -457,12 +409,10 @@ FluObject{ onTapListener:function(){ FluApp.navigate("/hotload") } - onDropped:{ FluApp.navigate("/hotload") } } FluPaneItem{ title:"3D" url:"qrc:/example/qml/page/T_3D.qml" - onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) } onTap:{ navigationView.push(url) } } } diff --git a/framelesshelper b/framelesshelper index 295fb74e..125da5c8 160000 --- a/framelesshelper +++ b/framelesshelper @@ -1 +1 @@ -Subproject commit 295fb74e69a007f83535b170dd7b78d85fe8d61a +Subproject commit 125da5c8e1ab37ce87c863c7c336a27bf64cec54 diff --git a/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml b/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml index 2f1f7d8b..64c9a652 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml @@ -463,10 +463,6 @@ Item { leftMargin: 6 rightMargin: 6 } - Drag.active: item_mouse.drag.active - Drag.hotSpot.x: item_control.width / 2 - Drag.hotSpot.y: item_control.height / 2 - Drag.dragType: Drag.Automatic onClicked:{ if(type === 0){ if(model.onTapListener){ @@ -496,18 +492,6 @@ Item { id:item_mouse anchors.fill: parent acceptedButtons: Qt.RightButton | Qt.LeftButton - drag.target: item_control - onPositionChanged: { - parent.grabToImage(function(result) { - parent.Drag.imageSource = result.url; - }) - } - drag.onActiveChanged: - if (active) { - parent.grabToImage(function(result) { - parent.Drag.imageSource = result.url; - }) - } onClicked: (mouse)=>{ if (mouse.button === Qt.RightButton) { @@ -860,15 +844,6 @@ Item { } } } - DropArea{ - anchors.fill: loader_content - onDropped: - (drag)=>{ - if(drag.source.modelData){ - drag.source.modelData.dropped(drag) - } - } - } Loader{ id:loader_content anchors{ diff --git a/src/Qt5/imports/FluentUI/Controls/FluPaneItem.qml b/src/Qt5/imports/FluentUI/Controls/FluPaneItem.qml index 8514789b..e3b98c14 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluPaneItem.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluPaneItem.qml @@ -25,6 +25,4 @@ QtObject { property Component editDelegate property bool showEdit signal tap - signal dropped(var drag) } - diff --git a/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml b/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml index b74399c1..ac6512ef 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml @@ -464,10 +464,6 @@ Item { leftMargin: 6 rightMargin: 6 } - Drag.active: item_mouse.drag.active - Drag.hotSpot.x: item_control.width / 2 - Drag.hotSpot.y: item_control.height / 2 - Drag.dragType: Drag.Automatic onClicked:{ if(type === 0){ if(model.onTapListener){ @@ -497,18 +493,6 @@ Item { id:item_mouse anchors.fill: parent acceptedButtons: Qt.RightButton | Qt.LeftButton - drag.target: item_control - onPositionChanged: { - parent.grabToImage(function(result) { - parent.Drag.imageSource = result.url; - }) - } - drag.onActiveChanged: - if (active) { - parent.grabToImage(function(result) { - parent.Drag.imageSource = result.url; - }) - } onClicked: (mouse)=>{ if (mouse.button === Qt.RightButton) { @@ -861,15 +845,6 @@ Item { } } } - DropArea{ - anchors.fill: loader_content - onDropped: - (drag)=>{ - if(drag.source.modelData){ - drag.source.modelData.dropped(drag) - } - } - } Loader{ id:loader_content anchors{ @@ -1138,8 +1113,8 @@ Item { anchors.fill: parent clip: true currentIndex: -1 - boundsBehavior: ListView.StopAtBounds model: control_popup.childModel + boundsBehavior: ListView.StopAtBounds ScrollBar.vertical: FluScrollBar {} delegate:Button{ id:item_button diff --git a/src/Qt6/imports/FluentUI/Controls/FluPaneItem.qml b/src/Qt6/imports/FluentUI/Controls/FluPaneItem.qml index 92af6b8c..8a34ffb1 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluPaneItem.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluPaneItem.qml @@ -25,5 +25,4 @@ QtObject { property Component editDelegate property bool showEdit signal tap - signal dropped(var drag) }