update
parent
3eeaae24db
commit
db41a7a1ee
|
@ -12,10 +12,6 @@ FluWindow {
|
||||||
property bool appBarVisible: true
|
property bool appBarVisible: true
|
||||||
default property alias content: container.data
|
default property alias content: container.data
|
||||||
|
|
||||||
Component.onCompleted: {
|
|
||||||
console.debug(FramelessUtils.frameBorderVisible)
|
|
||||||
}
|
|
||||||
|
|
||||||
FluAppBar {
|
FluAppBar {
|
||||||
id: title_bar
|
id: title_bar
|
||||||
title: window.title
|
title: window.title
|
||||||
|
|
|
@ -101,7 +101,6 @@ FluScrollablePage{
|
||||||
selected : appInfo.lang.objectName === modelData
|
selected : appInfo.lang.objectName === modelData
|
||||||
text:modelData
|
text:modelData
|
||||||
onClicked:{
|
onClicked:{
|
||||||
console.debug(modelData)
|
|
||||||
appInfo.changeLang(modelData)
|
appInfo.changeLang(modelData)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,6 +16,7 @@ Item {
|
||||||
property string title: ""
|
property string title: ""
|
||||||
property FluObject items
|
property FluObject items
|
||||||
property FluObject footerItems
|
property FluObject footerItems
|
||||||
|
property bool dontPageAnimation: false
|
||||||
property int displayMode: FluNavigationView.Auto
|
property int displayMode: FluNavigationView.Auto
|
||||||
property Component autoSuggestBox
|
property Component autoSuggestBox
|
||||||
property Component actionItem
|
property Component actionItem
|
||||||
|
@ -482,7 +483,6 @@ Item {
|
||||||
if(item.idx<(nav_list.count - layout_footer.count)){
|
if(item.idx<(nav_list.count - layout_footer.count)){
|
||||||
layout_footer.currentIndex = -1
|
layout_footer.currentIndex = -1
|
||||||
}else{
|
}else{
|
||||||
console.debug(item.idx-(nav_list.count-layout_footer.count))
|
|
||||||
layout_footer.currentIndex = item.idx-(nav_list.count-layout_footer.count)
|
layout_footer.currentIndex = item.idx-(nav_list.count-layout_footer.count)
|
||||||
}
|
}
|
||||||
nav_list.currentIndex = item.idx
|
nav_list.currentIndex = item.idx
|
||||||
|
@ -563,7 +563,7 @@ Item {
|
||||||
properties: "y"
|
properties: "y"
|
||||||
from: 0
|
from: 0
|
||||||
to: nav_swipe.height
|
to: nav_swipe.height
|
||||||
duration: 167
|
duration: dontPageAnimation ? 0 : 167
|
||||||
easing.type: Easing.BezierSpline
|
easing.type: Easing.BezierSpline
|
||||||
easing.bezierCurve: [ 1, 0, 0, 0 ]
|
easing.bezierCurve: [ 1, 0, 0, 0 ]
|
||||||
}
|
}
|
||||||
|
@ -573,7 +573,7 @@ Item {
|
||||||
properties: "y";
|
properties: "y";
|
||||||
from: nav_swipe.height;
|
from: nav_swipe.height;
|
||||||
to: 0
|
to: 0
|
||||||
duration: 167
|
duration: dontPageAnimation ? 0 : 167
|
||||||
easing.type: Easing.BezierSpline
|
easing.type: Easing.BezierSpline
|
||||||
easing.bezierCurve: [ 0, 0, 0, 1 ]
|
easing.bezierCurve: [ 0, 0, 0, 1 ]
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue