Compare commits
3 Commits
3b4c327528
...
8662eb97aa
Author | SHA1 | Date |
---|---|---|
|
8662eb97aa | |
|
55a77eba4b | |
|
5dd3320f66 |
|
@ -88,6 +88,20 @@ FluScrollablePage{
|
|||
}
|
||||
}
|
||||
|
||||
FluArea{
|
||||
Layout.fillWidth: true
|
||||
Layout.topMargin: 20
|
||||
height: 50
|
||||
paddings: 10
|
||||
FluCheckBox{
|
||||
text:"fitsAppBarWindows"
|
||||
checked: window.fitsAppBarWindows
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
onClicked: {
|
||||
window.fitsAppBarWindows = !window.fitsAppBarWindows
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
FluArea{
|
||||
Layout.fillWidth: true
|
||||
|
@ -215,5 +229,4 @@ FluScrollablePage{
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -41,8 +41,11 @@ FluWindow {
|
|||
}
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
onFirstVisible: {
|
||||
tour.open()
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
checkUpdate(true)
|
||||
FluEventBus.registerEvent(event_checkupdate)
|
||||
}
|
||||
|
@ -239,7 +242,7 @@ FluWindow {
|
|||
}
|
||||
|
||||
function handleDarkChanged(button){
|
||||
if(!FluTheme.enableAnimation){
|
||||
if(!FluTheme.enableAnimation || window.fitsAppBarWindows === false){
|
||||
changeDark()
|
||||
}else{
|
||||
loader_reveal.sourceComponent = com_reveal
|
||||
|
|
|
@ -91,6 +91,21 @@ FluScrollablePage{
|
|||
}
|
||||
}
|
||||
|
||||
FluArea{
|
||||
Layout.fillWidth: true
|
||||
Layout.topMargin: 20
|
||||
height: 50
|
||||
paddings: 10
|
||||
FluCheckBox{
|
||||
text:"fitsAppBarWindows"
|
||||
checked: window.fitsAppBarWindows
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
onClicked: {
|
||||
window.fitsAppBarWindows = !window.fitsAppBarWindows
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
FluArea{
|
||||
Layout.fillWidth: true
|
||||
Layout.topMargin: 20
|
||||
|
@ -217,5 +232,4 @@ FluScrollablePage{
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -44,8 +44,11 @@ FluWindow {
|
|||
}
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
onFirstVisible: {
|
||||
tour.open()
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
checkUpdate(true)
|
||||
FluEventBus.registerEvent(event_checkupdate)
|
||||
}
|
||||
|
@ -242,7 +245,7 @@ FluWindow {
|
|||
}
|
||||
|
||||
function handleDarkChanged(button){
|
||||
if(!FluTheme.enableAnimation){
|
||||
if(!FluTheme.enableAnimation || window.fitsAppBarWindows === false){
|
||||
changeDark()
|
||||
}else{
|
||||
loader_reveal.sourceComponent = com_reveal
|
||||
|
|
|
@ -39,6 +39,7 @@ Window {
|
|||
property bool showMaximize: true
|
||||
property bool showStayTop: true
|
||||
property bool useSystemAppBar
|
||||
property bool autoMaximize: false
|
||||
property var closeListener: function(event){
|
||||
if(closeDestory){
|
||||
destoryOnClose()
|
||||
|
@ -48,6 +49,7 @@ Window {
|
|||
}
|
||||
}
|
||||
signal initArgument(var argument)
|
||||
signal firstVisible()
|
||||
id:window
|
||||
maximumWidth: useSystemAppBar&&fixSize ? width : 16777215
|
||||
maximumHeight: useSystemAppBar&&fixSize ? height : 16777215
|
||||
|
@ -64,17 +66,26 @@ Window {
|
|||
d.changedStayTop()
|
||||
if(useSystemAppBar){
|
||||
window.moveWindowToDesktopCenter()
|
||||
window.visible = true
|
||||
if(window.autoMaximize){
|
||||
window.showMaximized()
|
||||
}else{
|
||||
window.show()
|
||||
}
|
||||
}
|
||||
}
|
||||
Component.onDestruction: {
|
||||
lifecycle.onDestruction()
|
||||
}
|
||||
onVisibleChanged: {
|
||||
if(visible && d.isFirstVisible){
|
||||
window.firstVisible()
|
||||
d.isFirstVisible = false
|
||||
}
|
||||
lifecycle.onVisible(visible)
|
||||
}
|
||||
QtObject{
|
||||
id:d
|
||||
property bool isFirstVisible: true
|
||||
function changedStayTop(){
|
||||
function toggleStayTop(){
|
||||
if(window.stayTop){
|
||||
|
@ -113,13 +124,18 @@ Window {
|
|||
left: parent.left
|
||||
right: parent.right
|
||||
}
|
||||
sourceComponent: window.useSystemAppBar ? undefined : com_app_bar
|
||||
sourceComponent: FluApp.useSystemAppBar ? undefined : com_app_bar
|
||||
}
|
||||
Component{
|
||||
id:com_app_bar
|
||||
Item{
|
||||
data: window.appBar
|
||||
height: window.fitsAppBarWindows ? 0 : childrenRect.height
|
||||
height: {
|
||||
if(FluApp.useSystemAppBar){
|
||||
return 0
|
||||
}
|
||||
return window.fitsAppBarWindows ? 0 : childrenRect.height
|
||||
}
|
||||
}
|
||||
}
|
||||
Item{
|
||||
|
@ -224,7 +240,11 @@ Window {
|
|||
if (blurBehindWindowEnabled)
|
||||
window.background = undefined
|
||||
}
|
||||
window.show()
|
||||
if(window.autoMaximize){
|
||||
window.showMaximized()
|
||||
}else{
|
||||
window.show()
|
||||
}
|
||||
}
|
||||
}
|
||||
WindowLifecycle{
|
||||
|
@ -234,7 +254,7 @@ Window {
|
|||
id:loader_window_border
|
||||
anchors.fill: parent
|
||||
z:999
|
||||
sourceComponent: window.useSystemAppBar ? undefined : com_window_border
|
||||
sourceComponent: FluApp.useSystemAppBar ? undefined : com_window_border
|
||||
}
|
||||
Component{
|
||||
id:com_window_border
|
||||
|
@ -292,4 +312,7 @@ Window {
|
|||
_pageRegister.onResult(data)
|
||||
}
|
||||
}
|
||||
function containerItem(){
|
||||
return container
|
||||
}
|
||||
}
|
||||
|
|
|
@ -38,6 +38,7 @@ Window {
|
|||
property bool showMaximize: true
|
||||
property bool showStayTop: true
|
||||
property bool useSystemAppBar
|
||||
property bool autoMaximize: false
|
||||
property var closeListener: function(event){
|
||||
if(closeDestory){
|
||||
destoryOnClose()
|
||||
|
@ -47,6 +48,7 @@ Window {
|
|||
}
|
||||
}
|
||||
signal initArgument(var argument)
|
||||
signal firstVisible()
|
||||
id:window
|
||||
maximumWidth: useSystemAppBar&&fixSize ? width : 16777215
|
||||
maximumHeight: useSystemAppBar&&fixSize ? height : 16777215
|
||||
|
@ -63,17 +65,26 @@ Window {
|
|||
d.changedStayTop()
|
||||
if(useSystemAppBar){
|
||||
window.moveWindowToDesktopCenter()
|
||||
window.visible = true
|
||||
if(window.autoMaximize){
|
||||
window.showMaximized()
|
||||
}else{
|
||||
window.show()
|
||||
}
|
||||
}
|
||||
}
|
||||
Component.onDestruction: {
|
||||
lifecycle.onDestruction()
|
||||
}
|
||||
onVisibleChanged: {
|
||||
if(visible && d.isFirstVisible){
|
||||
window.firstVisible()
|
||||
d.isFirstVisible = false
|
||||
}
|
||||
lifecycle.onVisible(visible)
|
||||
}
|
||||
QtObject{
|
||||
id:d
|
||||
property bool isFirstVisible: true
|
||||
function changedStayTop(){
|
||||
function toggleStayTop(){
|
||||
if(window.stayTop){
|
||||
|
@ -112,13 +123,18 @@ Window {
|
|||
left: parent.left
|
||||
right: parent.right
|
||||
}
|
||||
sourceComponent: window.useSystemAppBar ? undefined : com_app_bar
|
||||
sourceComponent: FluApp.useSystemAppBar ? undefined : com_app_bar
|
||||
}
|
||||
Component{
|
||||
id:com_app_bar
|
||||
Item{
|
||||
data: window.appBar
|
||||
height: window.fitsAppBarWindows ? 0 : childrenRect.height
|
||||
height: {
|
||||
if(FluApp.useSystemAppBar){
|
||||
return 0
|
||||
}
|
||||
return window.fitsAppBarWindows ? 0 : childrenRect.height
|
||||
}
|
||||
}
|
||||
}
|
||||
Item{
|
||||
|
@ -223,7 +239,11 @@ Window {
|
|||
if (blurBehindWindowEnabled)
|
||||
window.background = undefined
|
||||
}
|
||||
window.show()
|
||||
if(window.autoMaximize){
|
||||
window.showMaximized()
|
||||
}else{
|
||||
window.show()
|
||||
}
|
||||
}
|
||||
}
|
||||
WindowLifecycle{
|
||||
|
@ -233,7 +253,7 @@ Window {
|
|||
id:loader_window_border
|
||||
anchors.fill: parent
|
||||
z:999
|
||||
sourceComponent: window.useSystemAppBar ? undefined : com_window_border
|
||||
sourceComponent: FluApp.useSystemAppBar ? undefined : com_window_border
|
||||
}
|
||||
Component{
|
||||
id:com_window_border
|
||||
|
@ -291,4 +311,7 @@ Window {
|
|||
_pageRegister.onResult(data)
|
||||
}
|
||||
}
|
||||
function containerItem(){
|
||||
return container
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue