From 0912dc393752ec722d1b496571789376c48ce2c7 Mon Sep 17 00:00:00 2001 From: Mentalflow <312902918@qq.com> Date: Tue, 6 Aug 2024 02:31:23 +0800 Subject: [PATCH] RibbonView: Add 'topBorderFix','bottomBorderFix' properties. --- lib_source/qml/Qt5/RibbonView.qml | 6 ++++-- lib_source/qml/Qt6/RibbonView.qml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib_source/qml/Qt5/RibbonView.qml b/lib_source/qml/Qt5/RibbonView.qml index 38bc7f7..8c0d240 100644 --- a/lib_source/qml/Qt5/RibbonView.qml +++ b/lib_source/qml/Qt5/RibbonView.qml @@ -14,6 +14,8 @@ Item { property bool isMainView: false property alias bgColor: bg.color property alias bgVisible: bg.visible + property real topBorderFix: 0 + property real bottomBorderFix: 0 z:-2 clip: true width: parent.width @@ -32,7 +34,7 @@ Item { right: parent.right top: parent.top } - height: isMainView ? Window.window ? Window.window.tabBar ? Math.abs(Window.window.tabBar.height - Window.window.tabBar.modernMargin) : 0 : 0 : 0 + height: (isMainView ? Window.window ? Window.window.tabBar ? Math.abs(Window.window.tabBar.height - Window.window.tabBar.modernMargin) : 0 : 0 : 0) + topBorderFix } Item{ @@ -60,7 +62,7 @@ Item { right: parent.right bottom: parent.bottom } - height: isMainView ? Window.window ? Window.window.tabBar ? Math.abs(Window.window.bottomBar.height) : 0 : 0 : 0 + height: (isMainView ? Window.window ? Window.window.tabBar ? Math.abs(Window.window.bottomBar.height) : 0 : 0 : 0) + bottomBorderFix } Component.onCompleted: { diff --git a/lib_source/qml/Qt6/RibbonView.qml b/lib_source/qml/Qt6/RibbonView.qml index c70442a..7fa37bf 100644 --- a/lib_source/qml/Qt6/RibbonView.qml +++ b/lib_source/qml/Qt6/RibbonView.qml @@ -14,6 +14,8 @@ Item { property bool isMainView: false property alias bgColor: bg.color property alias bgVisible: bg.visible + property real topBorderFix: 0 + property real bottomBorderFix: 0 z:-2 clip: true width: parent.width @@ -32,7 +34,7 @@ Item { right: parent.right top: parent.top } - height: isMainView ? Window.window ? Window.window.tabBar ? Math.abs(Window.window.tabBar.height - Window.window.tabBar.modernMargin) : 0 : 0 : 0 + height: (isMainView ? Window.window ? Window.window.tabBar ? Math.abs(Window.window.tabBar.height - Window.window.tabBar.modernMargin) : 0 : 0 : 0) + topBorderFix } Item{ @@ -60,7 +62,7 @@ Item { right: parent.right bottom: parent.bottom } - height: isMainView ? Window.window ? Window.window.tabBar ? Math.abs(Window.window.bottomBar.height) : 0 : 0 : 0 + height: (isMainView ? Window.window ? Window.window.tabBar ? Math.abs(Window.window.bottomBar.height) : 0 : 0 : 0) + bottomBorderFix } Component.onCompleted: {