Compare commits
2 Commits
03771cd7c9
...
112bb6e07a
Author | SHA1 | Date |
---|---|---|
|
112bb6e07a | |
|
26ad581072 |
|
@ -223,7 +223,7 @@ FluScrollablePage{
|
|||
FluMenuItem{
|
||||
text:"Menu_4"
|
||||
onClicked: {
|
||||
console.debug(parent.height)
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -241,20 +241,18 @@ FluScrollablePage{
|
|||
Layout.topMargin: -1
|
||||
code:'FluDropDownButton{
|
||||
text:"DropDownButton"
|
||||
items:[
|
||||
FluMenuItem{
|
||||
text:"Menu_1"
|
||||
},
|
||||
FluMenuItem{
|
||||
text:"Menu_2"
|
||||
},
|
||||
FluMenuItem{
|
||||
text:"Menu_3"
|
||||
},
|
||||
FluMenuItem{
|
||||
text:"Menu_4"
|
||||
}
|
||||
]
|
||||
FluMenuItem{
|
||||
text:"Menu_1"
|
||||
},
|
||||
FluMenuItem{
|
||||
text:"Menu_2"
|
||||
},
|
||||
FluMenuItem{
|
||||
text:"Menu_3"
|
||||
},
|
||||
FluMenuItem{
|
||||
text:"Menu_4"
|
||||
}
|
||||
}'
|
||||
}
|
||||
|
||||
|
|
|
@ -58,6 +58,7 @@ FluScrollablePage{
|
|||
width: parent.width
|
||||
height: parent.height
|
||||
contentWidth: width
|
||||
maximumFlickVelocity: 1680
|
||||
contentHeight: text_info.height
|
||||
ScrollBar.vertical: FluScrollBar {}
|
||||
FluText{
|
||||
|
|
|
@ -21,7 +21,7 @@ CustomWindow {
|
|||
launchMode: FluWindow.SingleTask
|
||||
|
||||
closeFunc:function(event){
|
||||
close_app.open()
|
||||
dialog_close.open()
|
||||
event.accepted = false
|
||||
}
|
||||
|
||||
|
@ -59,7 +59,7 @@ CustomWindow {
|
|||
}
|
||||
|
||||
FluContentDialog{
|
||||
id:close_app
|
||||
id:dialog_close
|
||||
title:"退出"
|
||||
message:"确定要退出程序吗?"
|
||||
negativeText:"最小化"
|
||||
|
|
|
@ -22,6 +22,10 @@ FluTextBox{
|
|||
id:control_popup
|
||||
y:control.height
|
||||
focus: false
|
||||
// modal: true
|
||||
// Overlay.modal: Item{}
|
||||
|
||||
padding: 0
|
||||
enter: Transition {
|
||||
NumberAnimation {
|
||||
property: "opacity"
|
||||
|
@ -30,15 +34,12 @@ FluTextBox{
|
|||
duration: FluTheme.enableAnimation ? 83 : 0
|
||||
}
|
||||
}
|
||||
background: FluRectangle{
|
||||
id:container
|
||||
width: control.width
|
||||
contentItem: FluRectangle{
|
||||
radius: [4,4,4,4]
|
||||
FluShadow{
|
||||
radius: 4
|
||||
}
|
||||
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{
|
||||
id:list_view
|
||||
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: {
|
||||
loadData()
|
||||
|
|
|
@ -75,7 +75,7 @@ Button {
|
|||
color: control.textColor
|
||||
}
|
||||
onClicked: {
|
||||
if(items && menu.count !==0){
|
||||
if(menu.count !==0){
|
||||
var pos = control.mapToItem(null, 0, 0)
|
||||
var containerHeight = menu.count*36
|
||||
if(window.height>pos.y+control.height+containerHeight){
|
||||
|
|
|
@ -785,6 +785,7 @@ Item {
|
|||
}
|
||||
boundsBehavior: ListView.StopAtBounds
|
||||
clip: true
|
||||
maximumFlickVelocity: 1680
|
||||
contentHeight: nav_list.contentHeight
|
||||
ScrollBar.vertical: FluScrollBar {}
|
||||
ListView{
|
||||
|
|
|
@ -74,14 +74,11 @@ T.ScrollBar {
|
|||
}
|
||||
,Transition {
|
||||
to: "show"
|
||||
SequentialAnimation{
|
||||
PauseAnimation { duration: 100 }
|
||||
NumberAnimation {
|
||||
target: rect_bar
|
||||
properties: vertical ? "width" : "height"
|
||||
duration: 167
|
||||
easing.type: Easing.OutCubic
|
||||
}
|
||||
NumberAnimation {
|
||||
target: rect_bar
|
||||
properties: vertical ? "width" : "height"
|
||||
duration: 167
|
||||
easing.type: Easing.OutCubic
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
@ -38,6 +38,7 @@ FluPage {
|
|||
bottom: parent.bottom
|
||||
bottomMargin: control.bottomPadding
|
||||
}
|
||||
maximumFlickVelocity: 1680
|
||||
contentWidth: parent.width
|
||||
contentHeight: container.height
|
||||
ScrollBar.vertical: FluScrollBar {
|
||||
|
|
|
@ -170,6 +170,7 @@ Rectangle {
|
|||
}
|
||||
boundsBehavior: Flickable.StopAtBounds
|
||||
ScrollBar.horizontal: FluScrollBar{}
|
||||
maximumFlickVelocity: 1680
|
||||
ScrollBar.vertical: FluScrollBar{}
|
||||
selectionModel: ItemSelectionModel {
|
||||
id:selection_model
|
||||
|
|
|
@ -250,6 +250,8 @@ Item {
|
|||
model: tree_model
|
||||
flickableDirection: Flickable.HorizontalAndVerticalFlick
|
||||
clip: true
|
||||
boundsBehavior: ListView.StopAtBounds
|
||||
maximumFlickVelocity: 1680
|
||||
ScrollBar.vertical: FluScrollBar {}
|
||||
ScrollBar.horizontal: FluScrollBar { }
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue