Compare commits

..

No commits in common. "531bffdf1a3bf60ab13b983f9f565204f457bbf5" and "ad79480345bcda2f33c426aa7e3613b41ff40553" have entirely different histories.

6 changed files with 12 additions and 60 deletions

View File

@ -28,7 +28,6 @@ FluScrollablePage{
fillMode:Image.PreserveAspectCrop fillMode:Image.PreserveAspectCrop
anchors.fill: parent anchors.fill: parent
verticalAlignment: Qt.AlignTop verticalAlignment: Qt.AlignTop
sourceSize: Qt.size(960,640)
source: "qrc:/example/res/image/bg_home_header.png" source: "qrc:/example/res/image/bg_home_header.png"
} }
Rectangle{ Rectangle{

View File

@ -29,7 +29,6 @@ FluScrollablePage{
anchors.fill: parent anchors.fill: parent
asynchronous: true asynchronous: true
verticalAlignment: Qt.AlignTop verticalAlignment: Qt.AlignTop
sourceSize: Qt.size(960,640)
source: "qrc:/example/res/image/bg_home_header.png" source: "qrc:/example/res/image/bg_home_header.png"
} }
Rectangle{ Rectangle{

View File

@ -8,7 +8,7 @@ Button {
property string contentDescription: "" property string contentDescription: ""
QtObject{ QtObject{
id:d id:d
property bool checked: rect_back.height == background.height property bool checked: rect_back.height === background.height
} }
property color normalColor: { property color normalColor: {
if(d.checked){ if(d.checked){

View File

@ -69,8 +69,6 @@ Window {
id:popup_loading id:popup_loading
modal:true modal:true
focus: true focus: true
width: window.width
height: window.height
anchors.centerIn: Overlay.overlay anchors.centerIn: Overlay.overlay
closePolicy: { closePolicy: {
if(cancel){ if(cancel){
@ -78,38 +76,17 @@ Window {
} }
return Popup.NoAutoClose return Popup.NoAutoClose
} }
Overlay.modal: Item {} Overlay.modal: Rectangle {
color: "#44000000"
}
onVisibleChanged: { onVisibleChanged: {
if(!visible){ if(!visible){
loader_loading.sourceComponent = undefined loader_loading.sourceComponent = undefined
} }
} }
padding: 0
opacity: 0
visible: true visible: true
Behavior on opacity { background: Item{}
SequentialAnimation {
PauseAnimation {
duration: 88
}
NumberAnimation{
duration: 167
}
}
}
Component.onCompleted: {
opacity = 1
}
background: Rectangle{
color:"#44000000"
}
contentItem: Item{ contentItem: Item{
MouseArea{
anchors.fill: parent
onClicked: {
popup_loading.visible = false
}
}
ColumnLayout{ ColumnLayout{
spacing: 8 spacing: 8
anchors.centerIn: parent anchors.centerIn: parent

View File

@ -9,7 +9,7 @@ Button {
property string contentDescription: "" property string contentDescription: ""
QtObject{ QtObject{
id:d id:d
property bool checked: rect_back.height == background.height property bool checked: rect_back.height === background.height
} }
property color normalColor: { property color normalColor: {
if(d.checked){ if(d.checked){

View File

@ -68,8 +68,6 @@ Window {
id:popup_loading id:popup_loading
modal:true modal:true
focus: true focus: true
width: window.width
height: window.height
anchors.centerIn: Overlay.overlay anchors.centerIn: Overlay.overlay
closePolicy: { closePolicy: {
if(cancel){ if(cancel){
@ -77,38 +75,17 @@ Window {
} }
return Popup.NoAutoClose return Popup.NoAutoClose
} }
Overlay.modal: Item {} Overlay.modal: Rectangle {
color: "#44000000"
}
onVisibleChanged: { onVisibleChanged: {
if(!visible){ if(!visible){
loader_loading.sourceComponent = undefined loader_loading.sourceComponent = undefined
} }
} }
padding: 0
opacity: 0
visible: true visible: true
Behavior on opacity { background: Item{}
SequentialAnimation {
PauseAnimation {
duration: 88
}
NumberAnimation{
duration: 167
}
}
}
Component.onCompleted: {
opacity = 1
}
background: Rectangle{
color:"#44000000"
}
contentItem: Item{ contentItem: Item{
MouseArea{
anchors.fill: parent
onClicked: {
popup_loading.visible = false
}
}
ColumnLayout{ ColumnLayout{
spacing: 8 spacing: 8
anchors.centerIn: parent anchors.centerIn: parent