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

Compare commits

base: Mentalflow:163c6d7380da13fec20d29778e12198f5b1e83da
Branches Tags
Mentalflow:main
Mentalflow:v1.1.1
Mentalflow:v1.1.0
Mentalflow:v1.0.4
Mentalflow:v1.0.3
Mentalflow:v1.0.2
Mentalflow:v1.0.1
Mentalflow:v1.0.0.0
..
compare: Mentalflow:f317fcbde7e43c76c56ba3963e3b924a7051ea31
Branches Tags
Mentalflow:main
Mentalflow:v1.1.1
Mentalflow:v1.1.0
Mentalflow:v1.0.4
Mentalflow:v1.0.3
Mentalflow:v1.0.2
Mentalflow:v1.0.1
Mentalflow:v1.0.0.0

No commits in common. "163c6d7380da13fec20d29778e12198f5b1e83da" and "f317fcbde7e43c76c56ba3963e3b924a7051ea31" have entirely different histories.
163c6d7380 ... f317fcbde7

7 changed files with 165 additions and 205 deletions
Show Stats Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.21) cmake_minimum_required(VERSION 3.21)
project(RibbonUI_Project VERSION 1.1.1 LANGUAGES CXX) project(RibbonUI_Project VERSION 1.1.0 LANGUAGES CXX)
# Find Qt Package # Find Qt Package
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)

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

@ -9,19 +9,17 @@ RibbonBlur {
parent: Overlay.overlay parent: Overlay.overlay
implicitWidth: parent.width implicitWidth: parent.width
implicitHeight: folded ? barHeight : Window.window.viewItems.height implicitHeight: folded ? barHeight : Window.window.viewItems.height
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 maskOpacity: 0
bottomLeftRadius: folded ? 0 : 5 bottomLeftRadius: folded ? 0 : 5
bottomRightRadius: bottomLeftRadius bottomRightRadius: bottomLeftRadius
leftPadding: Window.window.tabBar && folded ? Window.window.tabBar.modernMargin : 0 enableEffect: handler.visible || !folded
rightPadding: leftPadding
enableEffect: !folded
readonly property alias folded: folded_btn.checked readonly property alias folded: folded_btn.checked
property int animationTime: 400 property int animationTime: 400
readonly property real currentMessageHeight: message_list.currentItem ? message_list.currentItem.height : 0 property real currentMessageHeight: message_list.currentItem ? message_list.currentItem.height : 0
readonly property real barHeight: folded ? currentMessageHeight + handler.height : 0 property real barHeight: folded ? currentMessageHeight + handler.height : 0
property alias messageModel: messageModel property alias messageModel: messageModel
property real topMargin: RibbonTheme.modernStyle && !folded ? 10 : 0 property real topMargin: RibbonTheme.modernStyle ? 5 : 0
Behavior on implicitHeight { Behavior on implicitHeight {
NumberAnimation { NumberAnimation {
@ -48,28 +46,22 @@ RibbonBlur {
} }
} }
RibbonRectangle{
id: message_list_rect
anchors{
top: parent.top
left: parent.left
right: parent.right
}
color: folded ? RibbonTheme.isDarkMode ? "black" : "white" : "transparent"
height: control.implicitHeight - (folded ? handler.height : 0)
bottomLeftRadius: RibbonTheme.modernStyle && folded ? 10 : 0
bottomRightRadius: bottomLeftRadius
ListView{ ListView{
id: message_list id: message_list
cacheBuffer: Math.abs(message_list.height * 2) cacheBuffer: Math.abs(message_list.height * 2)
interactive: !folded interactive: !folded
clip: true clip: true
anchors.fill: parent anchors{
top: parent.top
left: parent.left
right: parent.right
}
height: control.implicitHeight - (folded ? handler.height : 0)
model: messageModel model: messageModel
delegate: Item{ delegate: Item{
id: item id: item
implicitHeight: bar.contentHeight + (control.folded ? 0 : 10) implicitHeight: bar.contentHeight + (control.folded ? 0 : 10)
implicitWidth: message_list.width implicitWidth: control.width
RibbonMessageBar{ RibbonMessageBar{
id: bar id: bar
anchors.centerIn: parent anchors.centerIn: parent
@ -145,7 +137,7 @@ RibbonBlur {
} }
} }
} }
}
HoverHandler{ HoverHandler{
id: hover id: hover
} }
@ -155,11 +147,9 @@ RibbonBlur {
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: folded ? 10 : 20 implicitHeight: folded ? 10 : 20
implicitWidth: folded ? 100 : control.width implicitWidth: parent.width
visible: hover.hovered && messageModel.count > 1 visible: hover.hovered && messageModel.count > 1
bottomLeftRadius: folded ? 10 : 0 color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.5) : Qt.rgba(1,1,1,0.5)
bottomRightRadius: bottomLeftRadius
color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
Behavior on color { Behavior on color {
ColorAnimation { ColorAnimation {
duration: control.animationTime duration: control.animationTime

12
lib_source/qml/Qt5/RibbonRectangle.qml
View File

@ -11,10 +11,6 @@ Item {
property int topRightRadius: radius property int topRightRadius: radius
property int bottomLeftRadius: radius property int bottomLeftRadius: radius
property int bottomRightRadius: radius property int bottomRightRadius: radius
property int topPadding: 0
property int leftPadding: 0
property int rightPadding: 0
property int bottomPadding: 0
property real borderWidth: 0 property real borderWidth: 0
property string borderColor: "transparent" property string borderColor: "transparent"
default property alias contentItem: container.data default property alias contentItem: container.data
@ -69,13 +65,7 @@ Item {
Item{ Item{
id: container id: container
anchors{ anchors.fill: parent
fill: parent
topMargin: control.topPadding
bottomMargin: control.bottomPadding
leftMargin: control.leftPadding
rightMargin: control.rightPadding
}
clip: true clip: true
layer.enabled: true layer.enabled: true
layer.effect: OpacityMask { layer.effect: OpacityMask {

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

@ -13,6 +13,7 @@ Item{
left: parent.left left: parent.left
right:parent.right right:parent.right
} }
clip: true
property bool folded: false property bool folded: false
property int lastIndex property int lastIndex
default property alias content: stack.contentData default property alias content: stack.contentData
@ -241,7 +242,6 @@ Item{
Rectangle { Rectangle {
id: bottom_border id: bottom_border
anchors.top: stack.bottom anchors.top: stack.bottom
anchors.topMargin: modernStyle && Window.window.messageBar && Window.window.messageBar.folded ? Window.window.messageBar.currentMessageHeight : 0
width: parent.width width: parent.width
height: 1 height: 1
color: modernStyle ? "transparent" : bgColor color: modernStyle ? "transparent" : bgColor

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

@ -9,19 +9,17 @@ RibbonBlur {
parent: Overlay.overlay parent: Overlay.overlay
implicitWidth: parent.width implicitWidth: parent.width
implicitHeight: folded ? barHeight : Window.window.viewItems.height implicitHeight: folded ? barHeight : Window.window.viewItems.height
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 maskOpacity: 0
bottomLeftRadius: folded ? 0 : 5 bottomLeftRadius: folded ? 0 : 5
bottomRightRadius: bottomLeftRadius bottomRightRadius: bottomLeftRadius
leftPadding: Window.window.tabBar && folded ? Window.window.tabBar.modernMargin : 0 enableEffect: handler.visible || !folded
rightPadding: leftPadding
enableEffect: !folded
readonly property alias folded: folded_btn.checked readonly property alias folded: folded_btn.checked
property int animationTime: 400 property int animationTime: 400
readonly property real currentMessageHeight: message_list.currentItem ? message_list.currentItem.height : 0 property real currentMessageHeight: message_list.currentItem ? message_list.currentItem.height : 0
readonly property real barHeight: folded ? currentMessageHeight + handler.height : 0 property real barHeight: folded ? currentMessageHeight + handler.height : 0
property alias messageModel: messageModel property alias messageModel: messageModel
property real topMargin: RibbonTheme.modernStyle && !folded ? 10 : 0 property real topMargin: RibbonTheme.modernStyle ? 5 : 0
Behavior on implicitHeight { Behavior on implicitHeight {
NumberAnimation { NumberAnimation {
@ -48,28 +46,22 @@ RibbonBlur {
} }
} }
RibbonRectangle{
id: message_list_rect
anchors{
top: parent.top
left: parent.left
right: parent.right
}
color: folded ? RibbonTheme.isDarkMode ? "black" : "white" : "transparent"
height: control.implicitHeight - (folded ? handler.height : 0)
bottomLeftRadius: RibbonTheme.modernStyle && folded ? 10 : 0
bottomRightRadius: bottomLeftRadius
ListView{ ListView{
id: message_list id: message_list
cacheBuffer: Math.abs(message_list.height * 2) cacheBuffer: Math.abs(message_list.height * 2)
interactive: !folded interactive: !folded
clip: true clip: true
anchors.fill: parent anchors{
top: parent.top
left: parent.left
right: parent.right
}
height: control.implicitHeight - (folded ? handler.height : 0)
model: messageModel model: messageModel
delegate: Item{ delegate: Item{
id: item id: item
implicitHeight: bar.contentHeight + (control.folded ? 0 : 10) implicitHeight: bar.contentHeight + (control.folded ? 0 : 10)
implicitWidth: message_list.width implicitWidth: control.width
RibbonMessageBar{ RibbonMessageBar{
id: bar id: bar
anchors.centerIn: parent anchors.centerIn: parent
@ -145,7 +137,7 @@ RibbonBlur {
} }
} }
} }
}
HoverHandler{ HoverHandler{
id: hover id: hover
} }
@ -155,11 +147,9 @@ RibbonBlur {
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: folded ? 10 : 20 implicitHeight: folded ? 10 : 20
implicitWidth: folded ? 100 : control.width implicitWidth: parent.width
visible: hover.hovered && messageModel.count > 1 visible: hover.hovered && messageModel.count > 1
bottomLeftRadius: folded ? 10 : 0 color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.5) : Qt.rgba(1,1,1,0.5)
bottomRightRadius: bottomLeftRadius
color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
Behavior on color { Behavior on color {
ColorAnimation { ColorAnimation {
duration: control.animationTime duration: control.animationTime

12
lib_source/qml/Qt6/RibbonRectangle.qml
View File

@ -11,10 +11,6 @@ Item {
property int topRightRadius: radius property int topRightRadius: radius
property int bottomLeftRadius: radius property int bottomLeftRadius: radius
property int bottomRightRadius: radius property int bottomRightRadius: radius
property int topPadding: 0
property int leftPadding: 0
property int rightPadding: 0
property int bottomPadding: 0
property real borderWidth: 0 property real borderWidth: 0
property string borderColor: "transparent" property string borderColor: "transparent"
default property alias contentItem: container.data default property alias contentItem: container.data
@ -69,13 +65,7 @@ Item {
Item{ Item{
id: container id: container
anchors{ anchors.fill: parent
fill: parent
topMargin: control.topPadding
bottomMargin: control.bottomPadding
leftMargin: control.leftPadding
rightMargin: control.rightPadding
}
clip: true clip: true
layer.enabled: true layer.enabled: true
layer.effect: OpacityMask { layer.effect: OpacityMask {

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

@ -13,6 +13,7 @@ Item{
left: parent.left left: parent.left
right:parent.right right:parent.right
} }
clip: true
property bool folded: false property bool folded: false
property int lastIndex property int lastIndex
default property alias content: stack.contentData default property alias content: stack.contentData
@ -241,7 +242,6 @@ Item{
Rectangle { Rectangle {
id: bottom_border id: bottom_border
anchors.top: stack.bottom anchors.top: stack.bottom
anchors.topMargin: modernStyle && Window.window.messageBar && Window.window.messageBar.folded ? Window.window.messageBar.currentMessageHeight : 0
width: parent.width width: parent.width
height: 1 height: 1
color: modernStyle ? "transparent" : bgColor color: modernStyle ? "transparent" : bgColor