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

RibbonMessageGroup,example: visual effect improved and bug fixed.

This commit is contained in:
Mentalflow 2024-08-06 17:32:22 +08:00
parent 5d27353a38
commit 2a51e9e5f9
Signed by: Mentalflow
GPG Key ID: 5AE68D4401A2EE71
4 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
example/qml/Qt5/example.qml
View File

@ -16,8 +16,9 @@ RibbonWindow {
id: msg_bar id: msg_bar
implicitWidth: windowItems.width implicitWidth: windowItems.width
x: windowItems.x x: windowItems.x
y: titleBar.height + tab_bar.y + tab_bar.height - tab_bar.modernMargin + (RibbonTheme.modernStyle ? 5 : 0) y: titleBar.height + tab_bar.y + tab_bar.height - tab_bar.modernMargin + msg_bar.topMargin
target: windowItems target: windowItems
targetRect: Qt.rect(tab_bar.x,y,width,height)
Component.onCompleted: { Component.onCompleted: {
messageModel.append([{ messageModel.append([{
type: RibbonMessageBar.Info, type: RibbonMessageBar.Info,
@ -59,7 +60,6 @@ RibbonWindow {
externalURL: "https://github.com/mentalfl0w/RibbonUI", externalURL: "https://github.com/mentalfl0w/RibbonUI",
externalURLLabel: "Visit our website." externalURLLabel: "Visit our website."
}]) }])
messageBar.showMessage(RibbonMessageBar.Info, "test")
} }
} }
@ -157,7 +157,6 @@ RibbonWindow {
pageWidth: (page_slider.value / 100.0) * width pageWidth: (page_slider.value / 100.0) * width
spacing: 0 spacing: 0
isMainView: true isMainView: true
topBorderFix: msg_bar.folded ? msg_bar.barHeight : 0
ColumnLayout{ ColumnLayout{
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
Layout.topMargin: 30 Layout.topMargin: 30

5
example/qml/Qt6/example.qml
View File

@ -16,8 +16,9 @@ RibbonWindow {
id: msg_bar id: msg_bar
implicitWidth: windowItems.width implicitWidth: windowItems.width
x: windowItems.x x: windowItems.x
y: titleBar.height + tab_bar.y + tab_bar.height - tab_bar.modernMargin + (RibbonTheme.modernStyle ? 5 : 0) y: titleBar.height + tab_bar.y + tab_bar.height - tab_bar.modernMargin + msg_bar.topMargin
target: windowItems target: windowItems
targetRect: Qt.rect(tab_bar.x,y,width,height)
Component.onCompleted: { Component.onCompleted: {
messageModel.append([{ messageModel.append([{
type: RibbonMessageBar.Info, type: RibbonMessageBar.Info,
@ -59,7 +60,6 @@ RibbonWindow {
externalURL: "https://github.com/mentalfl0w/RibbonUI", externalURL: "https://github.com/mentalfl0w/RibbonUI",
externalURLLabel: "Visit our website." externalURLLabel: "Visit our website."
}]) }])
messageBar.showMessage(RibbonMessageBar.Info, "test")
} }
} }
@ -157,7 +157,6 @@ RibbonWindow {
pageWidth: (page_slider.value / 100.0) * width pageWidth: (page_slider.value / 100.0) * width
spacing: 0 spacing: 0
isMainView: true isMainView: true
topBorderFix: msg_bar.folded ? msg_bar.barHeight : 0
ColumnLayout{ ColumnLayout{
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
Layout.topMargin: 30 Layout.topMargin: 30

13
lib_source/qml/Qt5/RibbonMessageBarGroup.qml
View File

@ -7,9 +7,9 @@ RibbonBlur {
id: control id: control
parent: Overlay.overlay parent: Overlay.overlay
implicitWidth: parent.width implicitWidth: parent.width
useSolidBg: true
implicitHeight: 30 implicitHeight: 30
maskColor: folded ? "transparent" : RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1) maskColor: folded && !handler.visible ? "transparent" : RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
maskOpacity: 0
bottomLeftRadius: folded ? 0 : 5 bottomLeftRadius: folded ? 0 : 5
bottomRightRadius: bottomLeftRadius bottomRightRadius: bottomLeftRadius
enableEffect: handler.visible || !folded enableEffect: handler.visible || !folded
@ -17,6 +17,7 @@ RibbonBlur {
property int animationTime: 400 property int animationTime: 400
property real barHeight: implicitHeight - handler.height property real barHeight: implicitHeight - handler.height
property alias messageModel: messageModel property alias messageModel: messageModel
property real topMargin: RibbonTheme.modernStyle ? 5 : 0
Behavior on implicitHeight { Behavior on implicitHeight {
NumberAnimation { NumberAnimation {
@ -154,12 +155,8 @@ RibbonBlur {
id: handler id: handler
x: message_list.x + (message_list.width - width) / 2 x: message_list.x + (message_list.width - width) / 2
y: message_list.y + message_list.height * (folded ? 1 : 0) y: message_list.y + message_list.height * (folded ? 1 : 0)
implicitHeight: 20 implicitHeight: folded ? 10 : 20
implicitWidth: parent.width implicitWidth: parent.width
topLeftRadius: folded ? 0 : 10
topRightRadius: topLeftRadius
bottomLeftRadius: folded ? 10 : 0
bottomRightRadius: bottomLeftRadius
visible: hover.hovered && messageModel.count visible: hover.hovered && messageModel.count
color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.5) : Qt.rgba(1,1,1,0.5) color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.5) : Qt.rgba(1,1,1,0.5)
Behavior on color { Behavior on color {
@ -176,6 +173,7 @@ RibbonBlur {
showBg: false showBg: false
showHoveredBg: false showHoveredBg: false
iconSource: RibbonIcons.DismissCircle iconSource: RibbonIcons.DismissCircle
ribbonIcon.iconSize: handler.implicitHeight - 2
tipText: qsTr("Clear All") tipText: qsTr("Clear All")
onClicked: clearMessages() onClicked: clearMessages()
visible: !folded visible: !folded
@ -186,6 +184,7 @@ RibbonBlur {
checkable: true checkable: true
showBg: false showBg: false
showHoveredBg: false showHoveredBg: false
ribbonIcon.iconSize: handler.implicitHeight - 2
iconSource: RibbonIcons.TriangleDown iconSource: RibbonIcons.TriangleDown
rotation: checked ? 0 : 180 rotation: checked ? 0 : 180
checked: true checked: true

13
lib_source/qml/Qt6/RibbonMessageBarGroup.qml
View File

@ -7,9 +7,9 @@ RibbonBlur {
id: control id: control
parent: Overlay.overlay parent: Overlay.overlay
implicitWidth: parent.width implicitWidth: parent.width
useSolidBg: true
implicitHeight: 30 implicitHeight: 30
maskColor: folded ? "transparent" : RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1) maskColor: folded && !handler.visible ? "transparent" : RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
maskOpacity: 0
bottomLeftRadius: folded ? 0 : 5 bottomLeftRadius: folded ? 0 : 5
bottomRightRadius: bottomLeftRadius bottomRightRadius: bottomLeftRadius
enableEffect: handler.visible || !folded enableEffect: handler.visible || !folded
@ -17,6 +17,7 @@ RibbonBlur {
property int animationTime: 400 property int animationTime: 400
property real barHeight: implicitHeight - handler.height property real barHeight: implicitHeight - handler.height
property alias messageModel: messageModel property alias messageModel: messageModel
property real topMargin: RibbonTheme.modernStyle ? 5 : 0
Behavior on implicitHeight { Behavior on implicitHeight {
NumberAnimation { NumberAnimation {
@ -154,12 +155,8 @@ RibbonBlur {
id: handler id: handler
x: message_list.x + (message_list.width - width) / 2 x: message_list.x + (message_list.width - width) / 2
y: message_list.y + message_list.height * (folded ? 1 : 0) y: message_list.y + message_list.height * (folded ? 1 : 0)
implicitHeight: 20 implicitHeight: folded ? 10 : 20
implicitWidth: parent.width implicitWidth: parent.width
topLeftRadius: folded ? 0 : 10
topRightRadius: topLeftRadius
bottomLeftRadius: folded ? 10 : 0
bottomRightRadius: bottomLeftRadius
visible: hover.hovered && messageModel.count visible: hover.hovered && messageModel.count
color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.5) : Qt.rgba(1,1,1,0.5) color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.5) : Qt.rgba(1,1,1,0.5)
Behavior on color { Behavior on color {
@ -176,6 +173,7 @@ RibbonBlur {
showBg: false showBg: false
showHoveredBg: false showHoveredBg: false
iconSource: RibbonIcons.DismissCircle iconSource: RibbonIcons.DismissCircle
ribbonIcon.iconSize: handler.implicitHeight - 2
tipText: qsTr("Clear All") tipText: qsTr("Clear All")
onClicked: clearMessages() onClicked: clearMessages()
visible: !folded visible: !folded
@ -186,6 +184,7 @@ RibbonBlur {
checkable: true checkable: true
showBg: false showBg: false
showHoveredBg: false showHoveredBg: false
ribbonIcon.iconSize: handler.implicitHeight - 2
iconSource: RibbonIcons.TriangleDown iconSource: RibbonIcons.TriangleDown
rotation: checked ? 0 : 180 rotation: checked ? 0 : 180
checked: true checked: true