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

RibbonTabBar,RibbonRadioButton,RibbonTour: Bug fix for Qt 5.

This commit is contained in:
Mentalflow 2024-06-25 21:12:31 +08:00
parent 5f28e42e95
commit 0abdc29319
Signed by: Mentalflow
GPG Key ID: 5AE68D4401A2EE71
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib_source/qml/Qt5/RibbonRadioButton.qml
View File

@ -12,7 +12,7 @@ RadioButton {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding, implicitContentHeight + topPadding + bottomPadding,
implicitIndicatorHeight + topPadding + bottomPadding) implicitIndicatorHeight + topPadding + bottomPadding)
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
padding: 0 padding: 0
spacing: 6 spacing: 6
@ -56,11 +56,10 @@ RadioButton {
} }
} }
contentItem: RibbonText { contentItem: Text {
viewOnly: true
leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0
rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
text: control.text text: control.text
font: control.font font: control.font
color: control.labelColor color: control.labelColor

4
lib_source/qml/Qt5/RibbonTabBar.qml
View File

@ -75,8 +75,8 @@ Item{
useSolidBg: true useSolidBg: true
radius: modernStyle ? 10 :0 radius: modernStyle ? 10 :0
clip: true clip: true
target: Window.window.viewItems target: Window.window.viewItems ? Window.window.viewItems : undefined
targetRect: mapToItem(Window.window.viewItems, blur.x, blur.y, width, height) targetRect: Window.window.viewItems ? mapToItem(Window.window.viewItems, blur.x, blur.y, width, height) : Qt.rect(0,0,0,0)
Behavior on maskColor { Behavior on maskColor {
ColorAnimation { ColorAnimation {
duration: 60 duration: 60

2
lib_source/qml/Qt5/RibbonTour.qml
View File

@ -34,7 +34,7 @@ Popup {
y: (Overlay.overlay.height - height) / 2 y: (Overlay.overlay.height - height) / 2
closePolicy: Popup.NoAutoClose closePolicy: Popup.NoAutoClose
Overlay.modal:Rectangle{ Overlay.modal:Rectangle{
color: !RibbonTheme.isDarkMode ? Qt.alpha("white", 0.5) : Qt.alpha("black", 0.5) color: !RibbonTheme.isDarkMode ? Qt.rgba(255,255,255,0.5) : Qt.rgba(0,0,0,0.5)
} }
Overlay.modeless:Rectangle{ Overlay.modeless:Rectangle{
color:"transparent" color:"transparent"

7
lib_source/qml/Qt6/RibbonRadioButton.qml
View File

@ -12,7 +12,7 @@ RadioButton {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding, implicitContentHeight + topPadding + bottomPadding,
implicitIndicatorHeight + topPadding + bottomPadding) implicitIndicatorHeight + topPadding + bottomPadding)
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
padding: 0 padding: 0
spacing: 6 spacing: 6
@ -56,11 +56,10 @@ RadioButton {
} }
} }
contentItem: RibbonText { contentItem: Text {
viewOnly: true
leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0
rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
text: control.text text: control.text
font: control.font font: control.font
color: control.labelColor color: control.labelColor

4
lib_source/qml/Qt6/RibbonTabBar.qml
View File

@ -75,8 +75,8 @@ Item{
useSolidBg: true useSolidBg: true
radius: modernStyle ? 10 :0 radius: modernStyle ? 10 :0
clip: true clip: true
target: Window.window.viewItems target: Window.window.viewItems ? Window.window.viewItems : undefined
targetRect: mapToItem(Window.window.viewItems, blur.x, blur.y, width, height) targetRect: Window.window.viewItems ? mapToItem(Window.window.viewItems, blur.x, blur.y, width, height) : Qt.rect(0,0,0,0)
Behavior on maskColor { Behavior on maskColor {
ColorAnimation { ColorAnimation {
duration: 60 duration: 60