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

RibbonPopup,RibbonButton,RibbonTour,RibbonComboBox,RibbonPopupDialog: Use the suitable radius and follow the RibbonBlur's change.(#7)

This commit is contained in:
Mentalflow 2024-07-30 00:48:34 +08:00
parent 8ccc7d3920
commit 4ea04772d4
Signed by: Mentalflow
GPG Key ID: 5AE68D4401A2EE71
10 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ Button {
visible: showBg visible: showBg
border.color: isDarkMode ? "#7F7F7F" : "#D2D1CE" border.color: isDarkMode ? "#7F7F7F" : "#D2D1CE"
border.width: 1 border.width: 1
radius: 3 radius: 5
color: bgColor color: bgColor
} }
contentItem: Item{ contentItem: Item{
@ -41,7 +41,7 @@ Button {
implicitHeight: adaptHeight?root.parent.height>=layout.height?root.parent.height:layout.height:layout.height + 10 implicitHeight: adaptHeight?root.parent.height>=layout.height?root.parent.height:layout.height:layout.height + 10
Rectangle{ Rectangle{
anchors.fill: parent anchors.fill: parent
radius: 3 radius: background.radius
color: { color: {
if (root.pressed) if (root.pressed)
return pressedColor return pressedColor

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

@ -173,8 +173,8 @@ ComboBox {
background: RibbonBlur{ background: RibbonBlur{
radius: 5 radius: 5
maskOpacity: 1 maskOpacity: 1
maskBorder.color: RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5" maskBorderColor: RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5"
maskBorder.width: 1 maskBorderWidth: 1
} }
enter: Transition { enter: Transition {

8
lib_source/qml/Qt5/RibbonPopup.qml
View File

@ -58,7 +58,7 @@ Popup {
RectangularGlow { RectangularGlow {
id: effect id: effect
anchors.fill: blur anchors.fill: blur
anchors.margins: blur.maskBorder.width anchors.margins: blur.maskBorderWidth
glowRadius: 20 glowRadius: 20
spread: 0 spread: 0
color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.7) : Qt.rgba(0,0,0,0.45) color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.7) : Qt.rgba(0,0,0,0.45)
@ -68,12 +68,12 @@ Popup {
implicitHeight: parent.height implicitHeight: parent.height
implicitWidth: parent.width implicitWidth: parent.width
id: blur id: blur
radius: 20 radius: 7
maskOpacity: blurEnabled ? 0.9 : 1 maskOpacity: blurEnabled ? 0.9 : 1
maskBorder.color: RibbonTheme.modernStyle ? maskBorderColor: RibbonTheme.modernStyle ?
RibbonTheme.isDarkMode ? "#7A7A7A" : "#2C59B7" : RibbonTheme.isDarkMode ? "#7A7A7A" : "#2C59B7" :
RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5" RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5"
maskBorder.width: 1 maskBorderWidth: 1
} }
} }
contentItem: Item{ contentItem: Item{

3
lib_source/qml/Qt5/RibbonPopupDialog.qml
View File

@ -13,7 +13,6 @@ RibbonPopup {
property bool isDarkMode: RibbonTheme.isDarkMode property bool isDarkMode: RibbonTheme.isDarkMode
property int contentMargins: 20 property int contentMargins: 20
showCloseBtn: false showCloseBtn: false
radius: 5
signal neutralClicked signal neutralClicked
signal negativeClicked signal negativeClicked
signal positiveClicked signal positiveClicked
@ -25,7 +24,7 @@ RibbonPopup {
id:layout_content id:layout_content
anchors.fill: parent anchors.fill: parent
color: 'transparent' color: 'transparent'
radius:5 radius:3
RibbonText{ RibbonText{
id:text_title id:text_title
font.pixelSize: 24 font.pixelSize: 24

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

@ -43,7 +43,7 @@ Popup {
RectangularGlow { RectangularGlow {
id: effect id: effect
anchors.fill: blur anchors.fill: blur
anchors.margins: blur.maskBorder.width anchors.margins: blur.maskBorderWidth
glowRadius: 10 glowRadius: 10
spread: 0 spread: 0
color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.7) : Qt.rgba(0,0,0,0.45) color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.7) : Qt.rgba(0,0,0,0.45)
@ -53,12 +53,12 @@ Popup {
implicitHeight: parent.height implicitHeight: parent.height
implicitWidth: parent.width implicitWidth: parent.width
id: blur id: blur
radius: 10 radius: 7
maskOpacity: blurEnabled ? 0.9 : 1 maskOpacity: blurEnabled ? 0.9 : 1
maskBorder.color: RibbonTheme.modernStyle ? maskBorderColor: RibbonTheme.modernStyle ?
RibbonTheme.isDarkMode ? "#7A7A7A" : "#2C59B7" : RibbonTheme.isDarkMode ? "#7A7A7A" : "#2C59B7" :
RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5" RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5"
maskBorder.width: 1 maskBorderWidth: 1
} }
} }
contentItem: Item{ contentItem: Item{

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

@ -32,7 +32,7 @@ Button {
visible: showBg visible: showBg
border.color: isDarkMode ? "#7F7F7F" : "#D2D1CE" border.color: isDarkMode ? "#7F7F7F" : "#D2D1CE"
border.width: 1 border.width: 1
radius: 3 radius: 5
color: bgColor color: bgColor
} }
contentItem: Item{ contentItem: Item{
@ -41,7 +41,7 @@ Button {
implicitHeight: adaptHeight?root.parent.height>=layout.height?root.parent.height:layout.height:layout.height + 10 implicitHeight: adaptHeight?root.parent.height>=layout.height?root.parent.height:layout.height:layout.height + 10
Rectangle{ Rectangle{
anchors.fill: parent anchors.fill: parent
radius: 3 radius: background.radius
color: { color: {
if (root.pressed) if (root.pressed)
return pressedColor return pressedColor

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

@ -171,8 +171,8 @@ ComboBox {
background: RibbonBlur{ background: RibbonBlur{
radius: 5 radius: 5
maskOpacity: 1 maskOpacity: 1
maskBorder.color: RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5" maskBorderColor: RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5"
maskBorder.width: 1 maskBorderWidth: 1
} }
enter: Transition { enter: Transition {

8
lib_source/qml/Qt6/RibbonPopup.qml
View File

@ -58,7 +58,7 @@ Popup {
RectangularGlow { RectangularGlow {
id: effect id: effect
anchors.fill: blur anchors.fill: blur
anchors.margins: blur.maskBorder.width anchors.margins: blur.maskBorderWidth
glowRadius: 20 glowRadius: 20
spread: 0 spread: 0
color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.7) : Qt.rgba(0,0,0,0.45) color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.7) : Qt.rgba(0,0,0,0.45)
@ -68,12 +68,12 @@ Popup {
implicitHeight: parent.height implicitHeight: parent.height
implicitWidth: parent.width implicitWidth: parent.width
id: blur id: blur
radius: 20 radius: 7
maskOpacity: blurEnabled ? 0.9 : 1 maskOpacity: blurEnabled ? 0.9 : 1
maskBorder.color: RibbonTheme.modernStyle ? maskBorderColor: RibbonTheme.modernStyle ?
RibbonTheme.isDarkMode ? "#7A7A7A" : "#2C59B7" : RibbonTheme.isDarkMode ? "#7A7A7A" : "#2C59B7" :
RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5" RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5"
maskBorder.width: 1 maskBorderWidth: 1
} }
} }
contentItem: Item{ contentItem: Item{

3
lib_source/qml/Qt6/RibbonPopupDialog.qml
View File

@ -14,7 +14,6 @@ RibbonPopup {
property bool isDarkMode: RibbonTheme.isDarkMode property bool isDarkMode: RibbonTheme.isDarkMode
property int contentMargins: 20 property int contentMargins: 20
showCloseBtn: false showCloseBtn: false
radius: 5
signal neutralClicked signal neutralClicked
signal negativeClicked signal negativeClicked
signal positiveClicked signal positiveClicked
@ -26,7 +25,7 @@ RibbonPopup {
id:layout_content id:layout_content
anchors.fill: parent anchors.fill: parent
color: 'transparent' color: 'transparent'
radius:5 radius:3
RibbonText{ RibbonText{
id:text_title id:text_title
font.pixelSize: 24 font.pixelSize: 24

8
lib_source/qml/Qt6/RibbonTour.qml
View File

@ -44,7 +44,7 @@ Popup {
RectangularGlow { RectangularGlow {
id: effect id: effect
anchors.fill: blur anchors.fill: blur
anchors.margins: blur.maskBorder.width anchors.margins: blur.maskBorderWidth
glowRadius: 10 glowRadius: 10
spread: 0 spread: 0
color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.7) : Qt.rgba(0,0,0,0.45) color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.7) : Qt.rgba(0,0,0,0.45)
@ -54,12 +54,12 @@ Popup {
implicitHeight: parent.height implicitHeight: parent.height
implicitWidth: parent.width implicitWidth: parent.width
id: blur id: blur
radius: 10 radius: 7
maskOpacity: blurEnabled ? 0.9 : 1 maskOpacity: blurEnabled ? 0.9 : 1
maskBorder.color: RibbonTheme.modernStyle ? maskBorderColor: RibbonTheme.modernStyle ?
RibbonTheme.isDarkMode ? "#7A7A7A" : "#2C59B7" : RibbonTheme.isDarkMode ? "#7A7A7A" : "#2C59B7" :
RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5" RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5"
maskBorder.width: 1 maskBorderWidth: 1
} }
} }
contentItem: Item{ contentItem: Item{