Compare commits

...

2 Commits

Author SHA1 Message Date
zhuzichu 112bb6e07a update 2023-07-07 17:58:00 +08:00
zhuzichu 26ad581072 update 2023-07-07 16:56:29 +08:00
10 changed files with 37 additions and 30 deletions

View File

@ -223,7 +223,7 @@ FluScrollablePage{
FluMenuItem{ FluMenuItem{
text:"Menu_4" text:"Menu_4"
onClicked: { onClicked: {
console.debug(parent.height)
} }
} }
} }
@ -241,7 +241,6 @@ FluScrollablePage{
Layout.topMargin: -1 Layout.topMargin: -1
code:'FluDropDownButton{ code:'FluDropDownButton{
text:"DropDownButton" text:"DropDownButton"
items:[
FluMenuItem{ FluMenuItem{
text:"Menu_1" text:"Menu_1"
}, },
@ -254,7 +253,6 @@ FluScrollablePage{
FluMenuItem{ FluMenuItem{
text:"Menu_4" text:"Menu_4"
} }
]
}' }'
} }

View File

@ -58,6 +58,7 @@ FluScrollablePage{
width: parent.width width: parent.width
height: parent.height height: parent.height
contentWidth: width contentWidth: width
maximumFlickVelocity: 1680
contentHeight: text_info.height contentHeight: text_info.height
ScrollBar.vertical: FluScrollBar {} ScrollBar.vertical: FluScrollBar {}
FluText{ FluText{

View File

@ -21,7 +21,7 @@ CustomWindow {
launchMode: FluWindow.SingleTask launchMode: FluWindow.SingleTask
closeFunc:function(event){ closeFunc:function(event){
close_app.open() dialog_close.open()
event.accepted = false event.accepted = false
} }
@ -59,7 +59,7 @@ CustomWindow {
} }
FluContentDialog{ FluContentDialog{
id:close_app id:dialog_close
title:"退出" title:"退出"
message:"确定要退出程序吗?" message:"确定要退出程序吗?"
negativeText:"最小化" negativeText:"最小化"

View File

@ -22,6 +22,10 @@ FluTextBox{
id:control_popup id:control_popup
y:control.height y:control.height
focus: false focus: false
// modal: true
// Overlay.modal: Item{}
padding: 0
enter: Transition { enter: Transition {
NumberAnimation { NumberAnimation {
property: "opacity" property: "opacity"
@ -30,15 +34,12 @@ FluTextBox{
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.enableAnimation ? 83 : 0
} }
} }
background: FluRectangle{ contentItem: FluRectangle{
id:container
width: control.width
radius: [4,4,4,4] radius: [4,4,4,4]
FluShadow{ FluShadow{
radius: 4 radius: 4
} }
color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1) color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
height: 38*Math.min(Math.max(list_view.count,1),8)
ListView{ ListView{
id:list_view id:list_view
anchors.fill: parent anchors.fill: parent
@ -86,6 +87,11 @@ FluTextBox{
} }
} }
} }
background: Item{
id:container
implicitWidth: control.width
implicitHeight: 38*Math.min(Math.max(list_view.count,1),8)
}
} }
onTextChanged: { onTextChanged: {
loadData() loadData()

View File

@ -75,7 +75,7 @@ Button {
color: control.textColor color: control.textColor
} }
onClicked: { onClicked: {
if(items && menu.count !==0){ if(menu.count !==0){
var pos = control.mapToItem(null, 0, 0) var pos = control.mapToItem(null, 0, 0)
var containerHeight = menu.count*36 var containerHeight = menu.count*36
if(window.height>pos.y+control.height+containerHeight){ if(window.height>pos.y+control.height+containerHeight){

View File

@ -785,6 +785,7 @@ Item {
} }
boundsBehavior: ListView.StopAtBounds boundsBehavior: ListView.StopAtBounds
clip: true clip: true
maximumFlickVelocity: 1680
contentHeight: nav_list.contentHeight contentHeight: nav_list.contentHeight
ScrollBar.vertical: FluScrollBar {} ScrollBar.vertical: FluScrollBar {}
ListView{ ListView{

View File

@ -74,8 +74,6 @@ T.ScrollBar {
} }
,Transition { ,Transition {
to: "show" to: "show"
SequentialAnimation{
PauseAnimation { duration: 100 }
NumberAnimation { NumberAnimation {
target: rect_bar target: rect_bar
properties: vertical ? "width" : "height" properties: vertical ? "width" : "height"
@ -83,7 +81,6 @@ T.ScrollBar {
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
} }
} }
}
] ]
} }
} }

View File

@ -38,6 +38,7 @@ FluPage {
bottom: parent.bottom bottom: parent.bottom
bottomMargin: control.bottomPadding bottomMargin: control.bottomPadding
} }
maximumFlickVelocity: 1680
contentWidth: parent.width contentWidth: parent.width
contentHeight: container.height contentHeight: container.height
ScrollBar.vertical: FluScrollBar { ScrollBar.vertical: FluScrollBar {

View File

@ -170,6 +170,7 @@ Rectangle {
} }
boundsBehavior: Flickable.StopAtBounds boundsBehavior: Flickable.StopAtBounds
ScrollBar.horizontal: FluScrollBar{} ScrollBar.horizontal: FluScrollBar{}
maximumFlickVelocity: 1680
ScrollBar.vertical: FluScrollBar{} ScrollBar.vertical: FluScrollBar{}
selectionModel: ItemSelectionModel { selectionModel: ItemSelectionModel {
id:selection_model id:selection_model

View File

@ -250,6 +250,8 @@ Item {
model: tree_model model: tree_model
flickableDirection: Flickable.HorizontalAndVerticalFlick flickableDirection: Flickable.HorizontalAndVerticalFlick
clip: true clip: true
boundsBehavior: ListView.StopAtBounds
maximumFlickVelocity: 1680
ScrollBar.vertical: FluScrollBar {} ScrollBar.vertical: FluScrollBar {}
ScrollBar.horizontal: FluScrollBar { } ScrollBar.horizontal: FluScrollBar { }
} }