never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NButton: fix issue when no icon defined

Browse source
This commit is contained in:
LemmyCook 2025-09-09 09:22:05 -04:00
parent fe139c208a
commit a6ccc8b0da
3 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/SidePanel/Cards/WeatherCard.qml
View file

@ -130,4 +130,4 @@ NBox {
NBusyIndicator {} NBusyIndicator {}
} }
} }
} }

36
Widgets/NButton.qml
View file

@ -80,29 +80,27 @@ Rectangle {
spacing: Style.marginXS * scaling spacing: Style.marginXS * scaling
// Icon (optional) // Icon (optional)
Loader { NIcon {
active: root.icon !== "" Layout.alignment: Qt.AlignVCenter
sourceComponent: NIcon { visible: root.icon !== ""
Layout.alignment: Qt.AlignVCenter
icon: root.icon icon: root.icon
font.pointSize: root.iconSize font.pointSize: root.iconSize
color: { color: {
if (!root.enabled) if (!root.enabled)
return Color.mOnSurfaceVariant return Color.mOnSurfaceVariant
if (root.outlined) { if (root.outlined) {
if (root.pressed || root.hovered) if (root.pressed || root.hovered)
return root.backgroundColor
return root.backgroundColor return root.backgroundColor
} return root.backgroundColor
return root.textColor
} }
return root.textColor
}
Behavior on color { Behavior on color {
ColorAnimation { ColorAnimation {
duration: Style.animationFast duration: Style.animationFast
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
}
} }
} }
} }

6
Widgets/NIcon.qml
View file

@ -7,8 +7,12 @@ Text {
readonly property string defaultIcon: "balloon" readonly property string defaultIcon: "balloon"
property string icon: defaultIcon property string icon: defaultIcon
visible: (icon !== undefined) && (icon !== "")
text: { text: {
if (icon === undefined || Bootstrap.icons[icon] === undefined) { if ((icon === undefined) || (icon === "")) {
return ""
}
if (Bootstrap.icons[icon] === undefined) {
Logger.warn("Icon", `"${icon}"`, "doesn't exist in the bootstrap font") Logger.warn("Icon", `"${icon}"`, "doesn't exist in the bootstrap font")
Logger.callStack() Logger.callStack()
return Bootstrap.icons[defaultIcon] return Bootstrap.icons[defaultIcon]