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

RibbonView and etc.: Fix border bug for RibbonMessageListView.

This commit is contained in:
Mentalflow 2024-06-28 17:08:39 +08:00
parent 564cc8ebd2
commit ec77863b96
Signed by: Mentalflow
GPG Key ID: 5AE68D4401A2EE71
8 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
example/qml/Qt5/example.qml
View File

@ -105,6 +105,7 @@ RibbonWindow {
anchors.fill: parent anchors.fill: parent
pageWidth: (page_slider.value / 100.0) * width pageWidth: (page_slider.value / 100.0) * width
spacing: 0 spacing: 0
isMainView: true
ColumnLayout{ ColumnLayout{
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
Layout.topMargin: 30 Layout.topMargin: 30

1
example/qml/Qt6/example.qml
View File

@ -105,6 +105,7 @@ RibbonWindow {
anchors.fill: parent anchors.fill: parent
pageWidth: (page_slider.value / 100.0) * width pageWidth: (page_slider.value / 100.0) * width
spacing: 0 spacing: 0
isMainView: true
ColumnLayout{ ColumnLayout{
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
Layout.topMargin: 30 Layout.topMargin: 30

6
lib_source/qml/Qt5/RibbonBottomBar.qml
View File

@ -30,8 +30,10 @@ Item {
maskOpacity: bgOpacity maskOpacity: bgOpacity
useSolidBg: true useSolidBg: true
clip: true clip: true
target: Window.window.viewItems target: Window.window.viewItems ? Window.window.viewItems : null
targetRect: Qt.rect(x, Window.window.viewItems.y + Window.window.viewItems.height, width, height) targetRect: Window.window.viewItems ?
Qt.rect(x, Window.window.viewItems.y + Window.window.viewItems.height, width, height) :
Qt.rect(0,0,0,0)
bottomLeftRadius: Qt.platform.os === 'windows' ? RibbonUI.isWin11 ? 7 : 0 : 10 bottomLeftRadius: Qt.platform.os === 'windows' ? RibbonUI.isWin11 ? 7 : 0 : 10
bottomRightRadius: bottomLeftRadius bottomRightRadius: bottomLeftRadius
Behavior on maskColor { Behavior on maskColor {

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

@ -75,7 +75,7 @@ Item{
useSolidBg: true useSolidBg: true
radius: modernStyle ? 10 :0 radius: modernStyle ? 10 :0
clip: true clip: true
target: Window.window.viewItems ? Window.window.viewItems : undefined target: Window.window.viewItems ? Window.window.viewItems : null
targetRect: Window.window.viewItems ? mapToItem(Window.window.viewItems, blur.x, blur.y, width, height) : Qt.rect(0,0,0,0) 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 {

10
lib_source/qml/Qt5/RibbonView.qml
View File

@ -11,6 +11,7 @@ Item {
property bool modernStyle: RibbonTheme.modernStyle property bool modernStyle: RibbonTheme.modernStyle
property bool isDarkMode: RibbonTheme.isDarkMode property bool isDarkMode: RibbonTheme.isDarkMode
property int spacing: 5 property int spacing: 5
property bool isMainView: false
property alias bgColor: bg.color property alias bgColor: bg.color
property alias bgVisible: bg.visible property alias bgVisible: bg.visible
z:-2 z:-2
@ -31,7 +32,7 @@ Item {
right: parent.right right: parent.right
top: parent.top top: parent.top
} }
height: Window.window.tabBar ? Math.abs(Window.window.tabBar.height - Window.window.tabBar.modernMargin) : 0 height: isMainView ? Window.window ? Window.window.tabBar ? Math.abs(Window.window.tabBar.height - Window.window.tabBar.modernMargin) : 0 : 0 : 0
} }
Item{ Item{
@ -59,8 +60,11 @@ Item {
right: parent.right right: parent.right
bottom: parent.bottom bottom: parent.bottom
} }
height: Window.window.tabBar ? Math.abs(Window.window.bottomBar.height) : 0 height: isMainView ? Window.window ? Window.window.tabBar ? Math.abs(Window.window.bottomBar.height) : 0 : 0 : 0
} }
Component.onCompleted: Window.window.viewItems = container Component.onCompleted: {
if(isMainView && Window.window)
Window.window.viewItems = container
}
} }

6
lib_source/qml/Qt6/RibbonBottomBar.qml
View File

@ -30,8 +30,10 @@ Item {
maskOpacity: bgOpacity maskOpacity: bgOpacity
useSolidBg: true useSolidBg: true
clip: true clip: true
target: Window.window.viewItems target: Window.window.viewItems ? Window.window.viewItems : null
targetRect: Qt.rect(x, Window.window.viewItems.y + Window.window.viewItems.height, width, height) targetRect: Window.window.viewItems ?
Qt.rect(x, Window.window.viewItems.y + Window.window.viewItems.height, width, height) :
Qt.rect(0,0,0,0)
bottomLeftRadius: Qt.platform.os === 'windows' ? RibbonUI.isWin11 ? 7 : 0 : 10 bottomLeftRadius: Qt.platform.os === 'windows' ? RibbonUI.isWin11 ? 7 : 0 : 10
bottomRightRadius: bottomLeftRadius bottomRightRadius: bottomLeftRadius
Behavior on maskColor { Behavior on maskColor {

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

@ -75,7 +75,7 @@ Item{
useSolidBg: true useSolidBg: true
radius: modernStyle ? 10 :0 radius: modernStyle ? 10 :0
clip: true clip: true
target: Window.window.viewItems ? Window.window.viewItems : undefined target: Window.window.viewItems ? Window.window.viewItems : null
targetRect: Window.window.viewItems ? mapToItem(Window.window.viewItems, blur.x, blur.y, width, height) : Qt.rect(0,0,0,0) 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 {

10
lib_source/qml/Qt6/RibbonView.qml
View File

@ -11,6 +11,7 @@ Item {
property bool modernStyle: RibbonTheme.modernStyle property bool modernStyle: RibbonTheme.modernStyle
property bool isDarkMode: RibbonTheme.isDarkMode property bool isDarkMode: RibbonTheme.isDarkMode
property int spacing: 5 property int spacing: 5
property bool isMainView: false
property alias bgColor: bg.color property alias bgColor: bg.color
property alias bgVisible: bg.visible property alias bgVisible: bg.visible
z:-2 z:-2
@ -31,7 +32,7 @@ Item {
right: parent.right right: parent.right
top: parent.top top: parent.top
} }
height: Window.window.tabBar ? Math.abs(Window.window.tabBar.height - Window.window.tabBar.modernMargin) : 0 height: isMainView ? Window.window ? Window.window.tabBar ? Math.abs(Window.window.tabBar.height - Window.window.tabBar.modernMargin) : 0 : 0 : 0
} }
Item{ Item{
@ -59,8 +60,11 @@ Item {
right: parent.right right: parent.right
bottom: parent.bottom bottom: parent.bottom
} }
height: Window.window.tabBar ? Math.abs(Window.window.bottomBar.height) : 0 height: isMainView ? Window.window ? Window.window.tabBar ? Math.abs(Window.window.bottomBar.height) : 0 : 0 : 0
} }
Component.onCompleted: Window.window.viewItems = container Component.onCompleted: {
if(isMainView && Window.window)
Window.window.viewItems = container
}
} }