Compare commits

..

3 Commits

6 changed files with 8 additions and 6 deletions

View File

@ -4,7 +4,7 @@ import RibbonUI 1.1
RibbonSplashScreen { RibbonSplashScreen {
id: root id: root
homeUrl: "qrc:/qt/qml/RibbonUIAPP/example.qml" homeUrl: "qrc:/qt/qml/RibbonUIAPP/example.qml"
delayMS: 10000 delayMS: 3000
contentArgs: { contentArgs: {
"implicitHeight": 250, "implicitHeight": 250,
"implicitWidth": 450, "implicitWidth": 450,
@ -16,7 +16,7 @@ RibbonSplashScreen {
interval: 1000 interval: 1000
triggeredOnStart: true triggeredOnStart: true
repeat: true repeat: true
running: true running: remainSeconds !== 0
property int remainSeconds: root.delayMS / 1000 property int remainSeconds: root.delayMS / 1000
onTriggered: { onTriggered: {
remainSeconds -= 1 remainSeconds -= 1

View File

@ -4,7 +4,7 @@ import RibbonUI
RibbonSplashScreen { RibbonSplashScreen {
id: root id: root
homeUrl: "qrc:/qt/qml/RibbonUIAPP/example.qml" homeUrl: "qrc:/qt/qml/RibbonUIAPP/example.qml"
delayMS: 10000 delayMS: 3000
contentArgs: { contentArgs: {
"implicitHeight": 250, "implicitHeight": 250,
"implicitWidth": 450, "implicitWidth": 450,
@ -16,7 +16,7 @@ RibbonSplashScreen {
interval: 1000 interval: 1000
triggeredOnStart: true triggeredOnStart: true
repeat: true repeat: true
running: true running: remainSeconds !== 0
property int remainSeconds: root.delayMS / 1000 property int remainSeconds: root.delayMS / 1000
onTriggered: { onTriggered: {
remainSeconds -= 1 remainSeconds -= 1

View File

@ -566,6 +566,7 @@ Popup {
body_menu_list.model.append(item) body_menu_list.model.append(item)
} }
} }
ani_modern_border.targetMenu = head_menu_list
menu_bg.currentMenu = 0 menu_bg.currentMenu = 0
head_menu_list.currentIndex = 0 head_menu_list.currentIndex = 0
body_menu_list.currentIndex = 0 body_menu_list.currentIndex = 0

View File

@ -115,9 +115,9 @@ Window {
if(Qt.platform.os === "osx") if(Qt.platform.os === "osx")
{ {
windowAgent.setWindowAttribute("blur-effect", blurBehindWindow ? RibbonTheme.isDarkMode ? "dark" : "light" : "none") windowAgent.setWindowAttribute("blur-effect", blurBehindWindow ? RibbonTheme.isDarkMode ? "dark" : "light" : "none")
PlatformSupport.showSystemTitleBtns(root, false)
} }
root.flags |= Qt.WindowStaysOnTopHint root.flags |= Qt.WindowStaysOnTopHint
PlatformSupport.showSystemTitleBtns(root, false)
root.visible = true root.visible = true
windowAgent.centralize() windowAgent.centralize()
raise() raise()

View File

@ -566,6 +566,7 @@ Popup {
body_menu_list.model.append(item) body_menu_list.model.append(item)
} }
} }
ani_modern_border.targetMenu = head_menu_list
menu_bg.currentMenu = 0 menu_bg.currentMenu = 0
head_menu_list.currentIndex = 0 head_menu_list.currentIndex = 0
body_menu_list.currentIndex = 0 body_menu_list.currentIndex = 0

View File

@ -115,9 +115,9 @@ Window {
if(Qt.platform.os === "osx") if(Qt.platform.os === "osx")
{ {
windowAgent.setWindowAttribute("blur-effect", blurBehindWindow ? RibbonTheme.isDarkMode ? "dark" : "light" : "none") windowAgent.setWindowAttribute("blur-effect", blurBehindWindow ? RibbonTheme.isDarkMode ? "dark" : "light" : "none")
PlatformSupport.showSystemTitleBtns(root, false)
} }
root.flags |= Qt.WindowStaysOnTopHint root.flags |= Qt.WindowStaysOnTopHint
PlatformSupport.showSystemTitleBtns(root, false)
root.visible = true root.visible = true
windowAgent.centralize() windowAgent.centralize()
raise() raise()