Mentalflow
/
RibbonUI
mirror of https://github.com/mentalfl0w/RibbonUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RibbonSplashScreenContent: Improve color.

This commit is contained in:
Mentalflow 2025-05-22 16:24:04 +08:00
parent 6bcf8f9e16
commit 2afc633bdb
Signed by: Mentalflow
GPG Key ID: 5AE68D4401A2EE71
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib_source/qml/Qt5/RibbonSplashScreenContent.qml
View File

@ -4,7 +4,7 @@ import QtQuick.Layouts 1.11
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
RibbonRectangle { Rectangle {
id: control id: control
property var dealWithLog: showLog property var dealWithLog: showLog
@ -15,7 +15,14 @@ RibbonRectangle {
color: { color: {
if (Window.window.blurBehindWindow) { if (Window.window.blurBehindWindow) {
return "transparent" if(RibbonTheme.modernStyle)
return "transparent"
else{
if(RibbonTheme.isDarkMode)
return "#282828"
else
return "#2C59B7"
}
} }
if (RibbonTheme.isDarkMode) { if (RibbonTheme.isDarkMode) {
return '#2C2B29' return '#2C2B29'
@ -24,7 +31,7 @@ RibbonRectangle {
} }
implicitHeight: Math.max(250, btn_layout.height + title_layout.height + log_text.height + btn_layout.anchors.topMargin * 2) implicitHeight: Math.max(250, btn_layout.height + title_layout.height + log_text.height + btn_layout.anchors.topMargin * 2)
implicitWidth: Math.max(450, title_layout.width + btn_layout.anchors.topMargin * 2) implicitWidth: Math.max(450, title_layout.width + btn_layout.anchors.topMargin * 2)
radius: 20 radius: Qt.platform.os === 'windows' ? RibbonUI.isWin11 ? 7 : 0 : 10
Behavior on color { Behavior on color {
ColorAnimation { ColorAnimation {
@ -45,12 +52,14 @@ RibbonRectangle {
leftMargin: Qt.platform.os === 'osx' ? anchors.topMargin : undefined leftMargin: Qt.platform.os === 'osx' ? anchors.topMargin : undefined
} }
RibbonButton{ RibbonButton{
textColor: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
showBg: false showBg: false
showHoveredBg: false showHoveredBg: false
iconSource: RibbonIcons.Subtract iconSource: RibbonIcons.Subtract
onClicked: Window.window.visibility = Window.Minimized onClicked: Window.window.visibility = Window.Minimized
} }
RibbonButton{ RibbonButton{
textColor: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
showBg: false showBg: false
showHoveredBg: false showHoveredBg: false
iconSource: RibbonIcons.Dismiss iconSource: RibbonIcons.Dismiss
@ -83,7 +92,7 @@ RibbonRectangle {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 16 font.pixelSize: 16
color: RibbonTheme.isDarkMode ? "white" : "black" color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {
@ -104,7 +113,8 @@ RibbonRectangle {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 50 font.pixelSize: 50
color: RibbonTheme.isDarkMode ? "white" : "black" font.bold: true
color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {
@ -120,7 +130,7 @@ RibbonRectangle {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 15 font.pixelSize: 15
color: RibbonTheme.isDarkMode ? "white" : "black" color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {
@ -133,6 +143,7 @@ RibbonRectangle {
RibbonBusyBar{ RibbonBusyBar{
Layout.topMargin: btn_layout.anchors.topMargin - title_layout.spacing Layout.topMargin: btn_layout.anchors.topMargin - title_layout.spacing
running: true running: true
color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
barWidth: control.width - btn_layout.anchors.topMargin * 4 barWidth: control.width - btn_layout.anchors.topMargin * 4
} }
} }
@ -148,7 +159,7 @@ RibbonRectangle {
text: qsTr("Loading...") text: qsTr("Loading...")
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 10 font.pixelSize: 10
color: RibbonTheme.isDarkMode ? "white" : "black" color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {

25
lib_source/qml/Qt6/RibbonSplashScreenContent.qml
View File

@ -4,7 +4,7 @@ import QtQuick.Layouts
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Window import QtQuick.Window
RibbonRectangle { Rectangle {
id: control id: control
property var dealWithLog: showLog property var dealWithLog: showLog
@ -15,7 +15,14 @@ RibbonRectangle {
color: { color: {
if (Window.window.blurBehindWindow) { if (Window.window.blurBehindWindow) {
return "transparent" if(RibbonTheme.modernStyle)
return "transparent"
else{
if(RibbonTheme.isDarkMode)
return "#282828"
else
return "#2C59B7"
}
} }
if (RibbonTheme.isDarkMode) { if (RibbonTheme.isDarkMode) {
return '#2C2B29' return '#2C2B29'
@ -24,7 +31,7 @@ RibbonRectangle {
} }
implicitHeight: Math.max(250, btn_layout.height + title_layout.height + log_text.height + btn_layout.anchors.topMargin * 2) implicitHeight: Math.max(250, btn_layout.height + title_layout.height + log_text.height + btn_layout.anchors.topMargin * 2)
implicitWidth: Math.max(450, title_layout.width + btn_layout.anchors.topMargin * 2) implicitWidth: Math.max(450, title_layout.width + btn_layout.anchors.topMargin * 2)
radius: 20 radius: Qt.platform.os === 'windows' ? RibbonUI.isWin11 ? 7 : 0 : 10
Behavior on color { Behavior on color {
ColorAnimation { ColorAnimation {
@ -45,12 +52,14 @@ RibbonRectangle {
leftMargin: Qt.platform.os === 'osx' ? anchors.topMargin : undefined leftMargin: Qt.platform.os === 'osx' ? anchors.topMargin : undefined
} }
RibbonButton{ RibbonButton{
textColor: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
showBg: false showBg: false
showHoveredBg: false showHoveredBg: false
iconSource: RibbonIcons.Subtract iconSource: RibbonIcons.Subtract
onClicked: Window.window.visibility = Window.Minimized onClicked: Window.window.visibility = Window.Minimized
} }
RibbonButton{ RibbonButton{
textColor: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
showBg: false showBg: false
showHoveredBg: false showHoveredBg: false
iconSource: RibbonIcons.Dismiss iconSource: RibbonIcons.Dismiss
@ -83,7 +92,7 @@ RibbonRectangle {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 16 font.pixelSize: 16
color: RibbonTheme.isDarkMode ? "white" : "black" color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {
@ -104,7 +113,8 @@ RibbonRectangle {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 50 font.pixelSize: 50
color: RibbonTheme.isDarkMode ? "white" : "black" font.bold: true
color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {
@ -120,7 +130,7 @@ RibbonRectangle {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 15 font.pixelSize: 15
color: RibbonTheme.isDarkMode ? "white" : "black" color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {
@ -133,6 +143,7 @@ RibbonRectangle {
RibbonBusyBar{ RibbonBusyBar{
Layout.topMargin: btn_layout.anchors.topMargin - title_layout.spacing Layout.topMargin: btn_layout.anchors.topMargin - title_layout.spacing
running: true running: true
color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
barWidth: control.width - btn_layout.anchors.topMargin * 4 barWidth: control.width - btn_layout.anchors.topMargin * 4
} }
} }
@ -148,7 +159,7 @@ RibbonRectangle {
text: qsTr("Loading...") text: qsTr("Loading...")
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 10 font.pixelSize: 10
color: RibbonTheme.isDarkMode ? "white" : "black" color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {