lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

UserInterface: more adjustments

Browse Source
This commit is contained in:
Ly-sec
2025-12-02 15:24:49 +01:00
parent 19fde6731a
commit d31e69ad63
32 changed files with 87 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Commons/Settings.qml
+1
View File
@@ -228,6 +228,7 @@ Singleton {
property bool forceBlackScreenCorners: false
property real scaleRatio: 1.0
property real radiusRatio: 1.0
property real iRadiusRatio: 1.0
property real boxRadiusRatio: 1.0
property real screenRadiusRatio: 1.0
property real animationSpeed: 1.0
Commons/Style.qml
+12 -12
View File
@@ -23,19 +23,19 @@ Singleton {
readonly property int fontWeightSemiBold: 600
readonly property int fontWeightBold: 700
// Radii (for panels: launcher, settings, control center, etc.)
readonly property int radiusXXS: Math.round(4 * Settings.data.general.boxRadiusRatio)
readonly property int radiusXS: Math.round(8 * Settings.data.general.boxRadiusRatio)
readonly property int radiusS: Math.round(12 * Settings.data.general.boxRadiusRatio)
readonly property int radiusM: Math.round(16 * Settings.data.general.boxRadiusRatio)
readonly property int radiusL: Math.round(20 * Settings.data.general.boxRadiusRatio)
// Container Radii: major layout sections (sidebars, cards, content panels)
readonly property int radiusXXS: Math.round(4 * Settings.data.general.radiusRatio)
readonly property int radiusXS: Math.round(8 * Settings.data.general.radiusRatio)
readonly property int radiusS: Math.round(12 * Settings.data.general.radiusRatio)
readonly property int radiusM: Math.round(16 * Settings.data.general.radiusRatio)
readonly property int radiusL: Math.round(20 * Settings.data.general.radiusRatio)
// Control radii (for UI components: buttons, widgets, etc.)
readonly property int cRadiusXXS: Math.round(4 * Settings.data.general.radiusRatio)
readonly property int cRadiusXS: Math.round(8 * Settings.data.general.radiusRatio)
readonly property int cRadiusS: Math.round(12 * Settings.data.general.radiusRatio)
readonly property int cRadiusM: Math.round(16 * Settings.data.general.radiusRatio)
readonly property int cRadiusL: Math.round(20 * Settings.data.general.radiusRatio)
// Input radii: interactive elements (buttons, toggles, text fields)
readonly property int iRadiusXXS: Math.round(4 * Settings.data.general.iRadiusRatio)
readonly property int iRadiusXS: Math.round(8 * Settings.data.general.iRadiusRatio)
readonly property int iRadiusS: Math.round(12 * Settings.data.general.iRadiusRatio)
readonly property int iRadiusM: Math.round(16 * Settings.data.general.iRadiusRatio)
readonly property int iRadiusL: Math.round(20 * Settings.data.general.iRadiusRatio)
readonly property int screenRadius: Math.round(20 * Settings.data.general.screenRadiusRatio)
Modules/Panels/Settings/Tabs/UserInterfaceTab.qml
+9 -9
View File
@@ -209,7 +209,7 @@ ColumnLayout {
}
}
// Box Border Radius
// Container Border Radius
ColumnLayout {
spacing: Style.marginXXS
Layout.fillWidth: true
@@ -228,9 +228,9 @@ ColumnLayout {
from: 0
to: 2
stepSize: 0.01
value: Settings.data.general.boxRadiusRatio
onMoved: value => Settings.data.general.boxRadiusRatio = value
text: Math.floor(Settings.data.general.boxRadiusRatio * 100) + "%"
value: Settings.data.general.radiusRatio
onMoved: value => Settings.data.general.radiusRatio = value
text: Math.floor(Settings.data.general.radiusRatio * 100) + "%"
}
// Reset button container
@@ -242,7 +242,7 @@ ColumnLayout {
icon: "refresh"
baseSize: Style.baseWidgetSize * 0.8
tooltipText: I18n.tr("settings.user-interface.box-border-radius.reset")
onClicked: Settings.data.general.boxRadiusRatio = 1.0
onClicked: Settings.data.general.radiusRatio = 1.0
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
}
@@ -269,9 +269,9 @@ ColumnLayout {
from: 0
to: 2
stepSize: 0.01
value: Settings.data.general.radiusRatio
onMoved: value => Settings.data.general.radiusRatio = value
text: Math.floor(Settings.data.general.radiusRatio * 100) + "%"
value: Settings.data.general.iRadiusRatio
onMoved: value => Settings.data.general.iRadiusRatio = value
text: Math.floor(Settings.data.general.iRadiusRatio * 100) + "%"
}
// Reset button container
@@ -283,7 +283,7 @@ ColumnLayout {
icon: "refresh"
baseSize: Style.baseWidgetSize * 0.8
tooltipText: I18n.tr("settings.user-interface.control-border-radius.reset")
onClicked: Settings.data.general.radiusRatio = 1.0
onClicked: Settings.data.general.iRadiusRatio = 1.0
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
}
Widgets/NButton.qml
+1 -1
View File
@@ -20,7 +20,7 @@ Rectangle {
property real iconSize: Style.fontSizeL
property bool outlined: false
property int horizontalAlignment: Qt.AlignHCenter
property real buttonRadius: Style.cRadiusS
property real buttonRadius: Style.iRadiusS
// Signals
signal clicked
Widgets/NCheckbox.qml
+1 -1
View File
@@ -37,7 +37,7 @@ RowLayout {
implicitWidth: Math.round(root.baseSize)
implicitHeight: Math.round(root.baseSize)
radius: Style.cRadiusXS
radius: Style.iRadiusXS
color: root.checked ? root.activeColor : Color.mSurface
border.color: Color.mOutline
border.width: Style.borderS
Widgets/NCircleStat.qml
+1 -1
View File
@@ -22,7 +22,7 @@ Rectangle {
width: 68
height: 92
color: flat ? Color.transparent : Color.mSurface
radius: Style.cRadiusS
radius: Style.iRadiusS
border.color: flat ? Color.transparent : Color.mSurfaceVariant
border.width: flat ? 0 : Style.borderS
Widgets/NCollapsible.qml
+2 -2
View File
@@ -25,7 +25,7 @@ ColumnLayout {
// Material 3 style background
color: root.expanded ? Color.mSecondary : Color.mSurfaceVariant
radius: Style.cRadiusL
radius: Style.iRadiusL
// Subtle border
border.color: root.expanded ? Color.mOnSecondary : Color.mOutline
@@ -149,7 +149,7 @@ ColumnLayout {
visible: root.expanded
color: Color.mSurface
radius: Style.cRadiusL
radius: Style.iRadiusL
border.color: Color.mOutline
border.width: Style.borderS
Widgets/NColorPicker.qml
+2 -2
View File
@@ -14,7 +14,7 @@ Rectangle {
implicitWidth: 150
implicitHeight: Math.round(Style.baseWidgetSize * 1.1)
radius: Style.cRadiusM
radius: Style.iRadiusM
color: Color.mSurface
border.color: Color.mOutline
border.width: Style.borderS
@@ -49,7 +49,7 @@ Rectangle {
Rectangle {
Layout.preferredWidth: root.height * 0.6
Layout.preferredHeight: root.height * 0.6
radius: Math.min(Style.cRadiusL, Layout.preferredWidth / 2)
radius: Math.min(Style.iRadiusL, Layout.preferredWidth / 2)
color: root.selectedColor
border.color: Color.mOutline
border.width: Style.borderS
Widgets/NColorPickerDialog.qml
+5 -5
View File
@@ -48,7 +48,7 @@ Popup {
background: Rectangle {
color: Color.mSurface
radius: Style.cRadiusS
radius: Style.iRadiusS
border.color: Color.mPrimary
border.width: Style.borderM
}
@@ -99,7 +99,7 @@ Popup {
Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: 80
radius: Style.cRadiusS
radius: Style.iRadiusS
color: root.selectedColor
border.color: Color.mOutline
border.width: Style.borderS
@@ -564,7 +564,7 @@ Popup {
Rectangle {
width: 10
height: 10
radius: Math.min(Style.cRadiusXS, width / 2)
radius: Math.min(Style.iRadiusXS, width / 2)
color: "transparent"
border.color: root.selectedColor.hsvValue < 0.5 ? "white" : "black"
border.width: 1
@@ -661,7 +661,7 @@ Popup {
Rectangle {
width: 24
height: 24
radius: Style.cRadiusXXS
radius: Style.iRadiusXXS
color: modelData.color
border.color: root.selectedColor.toString() === modelData.color.toString() ? Color.mPrimary : Color.mOutline
border.width: Math.max(1, root.selectedColor.toString() === modelData.color.toString() ? Style.borderM : Style.borderS)
@@ -698,7 +698,7 @@ Popup {
Rectangle {
width: 24
height: 24
radius: Math.min(Style.cRadiusXS, width / 2)
radius: Math.min(Style.iRadiusXS, width / 2)
color: modelData.color
border.color: root.selectedColor.toString() === modelData.color.toString() ? Color.mPrimary : Color.mOutline
border.width: root.selectedColor.toString() === modelData.color.toString() ? 2 : 1
Widgets/NColorSlider.qml
+3 -3
View File
@@ -39,7 +39,7 @@ Slider {
height: root.availableHeight - root.knobDiameter
width: root.trackWidth
radius: Math.min(Style.cRadiusL, width / 2)
radius: Math.min(Style.iRadiusL, width / 2)
color: Qt.alpha(Color.mSurface, 0.5)
border.color: Qt.alpha(Color.mOutline, 0.5)
border.width: Style.borderS
@@ -96,7 +96,7 @@ Slider {
id: knobCutout
implicitWidth: root.knobDiameter + root.cutoutExtra
implicitHeight: root.knobDiameter + root.cutoutExtra
radius: Math.min(Style.cRadiusL, width / 2)
radius: Math.min(Style.iRadiusL, width / 2)
color: root.cutoutColor !== undefined ? root.cutoutColor : Color.mSurface
y: root.visualPosition * (root.availableHeight - root.knobDiameter) - ((root.knobDiameter + root.cutoutExtra) / 2)
@@ -114,7 +114,7 @@ Slider {
id: knob
implicitWidth: root.knobDiameter
implicitHeight: root.knobDiameter
radius: Math.min(Style.cRadiusL, width / 2)
radius: Math.min(Style.iRadiusL, width / 2)
color: {
if (root.rainbowMode) {
// Hue Logic: Map position (0.0 to 1.0) directly to Hue
Widgets/NComboBox.qml
+3 -3
View File
@@ -76,7 +76,7 @@ RowLayout {
color: Color.mSurface
border.color: combo.activeFocus ? Color.mSecondary : Color.mOutline
border.width: Style.borderS
radius: Style.cRadiusM
radius: Style.iRadiusM
Behavior on border.color {
ColorAnimation {
@@ -165,7 +165,7 @@ RowLayout {
background: Rectangle {
anchors.fill: parent
color: highlighted ? Color.mHover : Color.transparent
radius: Style.cRadiusS
radius: Style.iRadiusS
Behavior on color {
ColorAnimation {
duration: Style.animationFast
@@ -195,7 +195,7 @@ RowLayout {
color: Color.mSurfaceVariant
border.color: Color.mOutline
border.width: Style.borderS
radius: Style.cRadiusM
radius: Style.iRadiusM
}
}
Widgets/NContextMenu.qml
+2 -2
View File
@@ -21,7 +21,7 @@ Popup {
color: Color.mSurfaceVariant
border.color: Color.mOutline
border.width: Style.borderS
radius: Style.cRadiusM
radius: Style.iRadiusM
}
contentItem: NListView {
@@ -45,7 +45,7 @@ Popup {
background: Rectangle {
color: menuItem.hovered && menuItem.enabled ? Color.mHover : Color.transparent
radius: Style.cRadiusS
radius: Style.iRadiusS
Behavior on color {
ColorAnimation {
Widgets/NDateTimeTokens.qml
+5 -5
View File
@@ -13,7 +13,7 @@ Rectangle {
color: Color.mSurface
border.color: Color.mOutline
border.width: Style.borderS
radius: Style.cRadiusM
radius: Style.iRadiusM
ColumnLayout {
id: column
@@ -203,7 +203,7 @@ Rectangle {
id: tokenDelegate
width: tokensList.width
height: layout.implicitHeight + Style.marginS
radius: Style.cRadiusS
radius: Style.iRadiusS
color: {
if (tokenMouseArea.containsMouse) {
return Qt.alpha(Color.mPrimary, 0.1);
@@ -253,7 +253,7 @@ Rectangle {
width: 70
height: 22
color: getCategoryColor(modelData.category)[0]
radius: Style.cRadiusS
radius: Style.iRadiusS
opacity: tokenMouseArea.containsMouse ? 0.9 : 1.0
Behavior on opacity {
@@ -277,7 +277,7 @@ Rectangle {
width: 100
height: 22
color: tokenMouseArea.containsMouse ? Color.mPrimary : Color.mOnSurface
radius: Style.cRadiusS
radius: Style.iRadiusS
Behavior on color {
ColorAnimation {
@@ -322,7 +322,7 @@ Rectangle {
width: 90
height: 22
color: tokenMouseArea.containsMouse ? Color.mPrimary : Color.mOnSurfaceVariant
radius: Style.cRadiusS
radius: Style.iRadiusS
border.color: tokenMouseArea.containsMouse ? Color.mPrimary : Color.mOutline
border.width: Style.borderS
Widgets/NFilePicker.qml
+9 -9
View File
@@ -134,7 +134,7 @@ Popup {
background: Rectangle {
color: Color.mSurfaceVariant
radius: Style.cRadiusL
radius: Style.iRadiusL
border.color: Color.mOutline
border.width: Style.borderS
}
@@ -231,7 +231,7 @@ Popup {
Layout.fillWidth: true
Layout.preferredHeight: 45
color: Color.mSurfaceVariant
radius: Style.cRadiusS
radius: Style.iRadiusS
border.color: Color.mOutline
border.width: Style.borderS
@@ -358,7 +358,7 @@ Popup {
Layout.fillWidth: true
Layout.fillHeight: true
color: Color.mSurface
radius: Style.cRadiusM
radius: Style.iRadiusM
border.color: Color.mOutline
border.width: Style.borderS
@@ -411,7 +411,7 @@ Popup {
contentItem: Rectangle {
implicitWidth: 6
implicitHeight: 100
radius: Style.cRadiusM
radius: Style.iRadiusM
color: Qt.alpha(Color.mHover, 0.8)
opacity: parent.policy === ScrollBar.AlwaysOn || parent.active ? 1.0 : 0.0
Behavior on opacity {
@@ -430,7 +430,7 @@ Popup {
implicitHeight: 100
color: Color.transparent
opacity: parent.policy === ScrollBar.AlwaysOn || parent.active ? 0.3 : 0.0
radius: (Style.cRadiusM) / 2
radius: (Style.iRadiusM) / 2
Behavior on opacity {
NumberAnimation {
duration: Style.animationFast
@@ -473,7 +473,7 @@ Popup {
width: gridView.itemSize
height: gridView.cellHeight
color: Color.transparent
radius: Style.cRadiusM
radius: Style.iRadiusM
property bool isSelected: filePickerPanel.currentSelection.includes(model.filePath)
@@ -546,7 +546,7 @@ Popup {
Rectangle {
anchors.fill: parent
color: Color.mSurfaceVariant
radius: Style.cRadiusS
radius: Style.iRadiusS
visible: thumbnail.status === Image.Loading
NIcon {
icon: "filepicker-photo"
@@ -578,7 +578,7 @@ Popup {
anchors.margins: Style.marginS
width: 24
height: 24
radius: Math.min(Style.cRadiusL, width / 2)
radius: Math.min(Style.iRadiusL, width / 2)
color: Color.mSecondary
border.color: Color.mOutline
border.width: Style.borderS
@@ -673,7 +673,7 @@ Popup {
return Color.mHover;
return Color.transparent;
}
radius: Style.cRadiusS
radius: Style.iRadiusS
Behavior on color {
ColorAnimation {
duration: Style.animationFast
Widgets/NGridView.qml
+1 -1
View File
@@ -21,7 +21,7 @@ Item {
property color handlePressedColor: handleColor
property color trackColor: Color.transparent
property real handleWidth: 6
property real handleRadius: Style.cRadiusM
property real handleRadius: Style.iRadiusM
property int verticalPolicy: ScrollBar.AsNeeded
property int horizontalPolicy: ScrollBar.AlwaysOff
readonly property bool verticalScrollBarActive: {
Widgets/NIconButton.qml
+2 -2
View File
@@ -24,7 +24,7 @@ Rectangle {
property color colorFgHover: Color.mOnHover
property color colorBorder: Color.mOutline
property color colorBorderHover: Color.mOutline
property real customRadius: -1 // -1 means use default (cRadiusL), otherwise use this value
property real customRadius: -1 // -1 means use default (iRadiusL), otherwise use this value
signal entered
signal exited
@@ -38,7 +38,7 @@ Rectangle {
opacity: root.enabled ? Style.opacityFull : Style.opacityMedium
color: root.enabled && root.hovering ? colorBgHover : colorBg
radius: Math.min((customRadius >= 0 ? customRadius : Style.cRadiusL), width / 2)
radius: Math.min((customRadius >= 0 ? customRadius : Style.iRadiusL), width / 2)
border.color: root.enabled && root.hovering ? colorBorderHover : colorBorder
border.width: Style.borderS
Widgets/NIconButtonHot.qml
+1 -1
View File
@@ -60,7 +60,7 @@ Rectangle {
}
return colorBg;
}
radius: Math.min(Style.cRadiusL, width / 2)
radius: Math.min(Style.iRadiusL, width / 2)
border.color: root.enabled && root.hovering ? colorBorderHover : colorBorder
border.width: Style.borderS
Widgets/NIconPicker.qml
+2 -2
View File
@@ -39,7 +39,7 @@ Popup {
background: Rectangle {
color: Color.mSurface
radius: Style.cRadiusL
radius: Style.iRadiusL
border.color: Color.mPrimary
border.width: Style.borderM
}
@@ -94,7 +94,7 @@ Popup {
delegate: Rectangle {
width: grid.cellWidth
height: grid.cellHeight
radius: Style.cRadiusS
radius: Style.iRadiusS
color: (root.selectedIcon === modelData) ? Qt.alpha(Color.mPrimary, 0.15) : Color.transparent
border.color: (root.selectedIcon === modelData) ? Color.mPrimary : Color.transparent
Widgets/NIconTabButton.qml
+1 -1
View File
@@ -25,7 +25,7 @@ Rectangle {
Layout.fillHeight: true
// Styling
radius: Style.cRadiusXS
radius: Style.iRadiusXS
color: root.checked ? Color.mPrimary : (root.isHovered ? Color.mHover : Color.mSurface)
Behavior on color {
Widgets/NListView.qml
+1 -1
View File
@@ -11,7 +11,7 @@ Item {
property color handlePressedColor: handleColor
property color trackColor: Color.transparent
property real handleWidth: 6
property real handleRadius: Style.cRadiusM
property real handleRadius: Style.iRadiusM
property int verticalPolicy: ScrollBar.AsNeeded
property int horizontalPolicy: ScrollBar.AlwaysOff
readonly property bool verticalScrollBarActive: {
Widgets/NPopupContextMenu.qml
+2 -2
View File
@@ -95,7 +95,7 @@ PopupWindow {
color: Color.mSurface
border.color: Color.mOutline
border.width: Style.borderS
radius: Style.cRadiusM
radius: Style.iRadiusM
opacity: root.visible ? 1.0 : 0.0
Behavior on opacity {
@@ -143,7 +143,7 @@ PopupWindow {
id: innerRect
anchors.fill: parent
color: mouseArea.containsMouse ? Color.mHover : Color.transparent
radius: Style.cRadiusS
radius: Style.iRadiusS
opacity: modelData.enabled !== false ? 1.0 : 0.5
Behavior on color {
Widgets/NRadioButton.qml
+2 -2
View File
@@ -15,7 +15,7 @@ RadioButton {
implicitWidth: Style.baseWidgetSize * 0.625 * pointSize / Style.fontSizeM
implicitHeight: Style.baseWidgetSize * 0.625 * pointSize / Style.fontSizeM
radius: Math.min(Style.cRadiusL, width / 2)
radius: Math.min(Style.iRadiusL, width / 2)
color: Color.transparent
border.color: root.checked ? Color.mPrimary : Color.mOnSurface
border.width: Style.borderM
@@ -25,7 +25,7 @@ RadioButton {
anchors.fill: parent
anchors.margins: parent.width * 0.3
radius: Math.min(Style.cRadiusL, width / 2)
radius: Math.min(Style.iRadiusL, width / 2)
color: Qt.alpha(Color.mPrimary, root.checked ? 1 : 0)
Behavior on color {
Widgets/NReorderCheckboxes.qml
+2 -2
View File
@@ -98,7 +98,7 @@ Item {
Layout.preferredWidth: root.baseSize
Layout.preferredHeight: root.baseSize
radius: Style.cRadiusXS
radius: Style.iRadiusXS
color: dragHandleMouseArea.containsMouse ? Color.mSurfaceVariant : Color.transparent
Behavior on color {
@@ -199,7 +199,7 @@ Item {
Layout.preferredWidth: root.baseSize
Layout.preferredHeight: root.baseSize
radius: Style.cRadiusXS
radius: Style.iRadiusXS
color: delegateItem.enabled ? root.activeColor : Color.mSurface
border.color: delegateItem.required ? root.activeColor : Color.mOutline
border.width: Style.borderS
Widgets/NScrollView.qml
+1 -1
View File
@@ -11,7 +11,7 @@ T.ScrollView {
property color handlePressedColor: handleColor
property color trackColor: Color.transparent
property real handleWidth: 6
property real handleRadius: Style.cRadiusM
property real handleRadius: Style.iRadiusM
property int verticalPolicy: ScrollBar.AsNeeded
property int horizontalPolicy: ScrollBar.AsNeeded
property bool preventHorizontalScroll: horizontalPolicy === ScrollBar.AlwaysOff
Widgets/NSearchableComboBox.qml
+3 -3
View File
@@ -124,7 +124,7 @@ RowLayout {
color: Color.mSurface
border.color: combo.activeFocus ? Color.mSecondary : Color.mOutline
border.width: Style.borderS
radius: Style.cRadiusM
radius: Style.iRadiusM
Behavior on border.color {
ColorAnimation {
@@ -243,7 +243,7 @@ RowLayout {
background: Rectangle {
width: listView.width
color: highlighted ? Color.mHover : Color.transparent
radius: Style.cRadiusS
radius: Style.iRadiusS
Behavior on color {
ColorAnimation {
duration: Style.animationFast
@@ -259,7 +259,7 @@ RowLayout {
color: Color.mSurfaceVariant
border.color: Color.mOutline
border.width: Style.borderS
radius: Style.cRadiusM
radius: Style.iRadiusM
}
}
Widgets/NSectionEditor.qml
+1 -1
View File
@@ -355,7 +355,7 @@ NBox {
id: dropIndicator
width: 3
height: Style.baseWidgetSize * 1.15
radius: Style.cRadiusXXS
radius: Style.iRadiusXXS
color: Color.mPrimary
opacity: 0
visible: opacity > 0
Widgets/NSlider.qml
+4 -4
View File
@@ -31,7 +31,7 @@ Slider {
implicitHeight: trackHeight
width: root.availableWidth
height: implicitHeight
radius: Math.min(Style.cRadiusL, height / 2)
radius: Math.min(Style.iRadiusL, height / 2)
color: Qt.alpha(Color.mSurface, 0.5)
border.color: Qt.alpha(Color.mOutline, 0.5)
border.width: Style.borderS
@@ -46,7 +46,7 @@ Slider {
Rectangle {
width: parent.height
height: parent.height
radius: Math.min(Style.cRadiusL, width / 2)
radius: Math.min(Style.iRadiusL, width / 2)
color: Qt.darker(fillColor, 1.2) //starting color of gradient
}
@@ -76,7 +76,7 @@ Slider {
id: knobCutout
implicitWidth: knobDiameter + cutoutExtra
implicitHeight: knobDiameter + cutoutExtra
radius: Math.min(Style.cRadiusL, width / 2)
radius: Math.min(Style.iRadiusL, width / 2)
color: root.cutoutColor !== undefined ? root.cutoutColor : Color.mSurface
x: root.leftPadding + root.visualPosition * (root.availableWidth - root.knobDiameter) - cutoutExtra
anchors.verticalCenter: parent.verticalCenter
@@ -93,7 +93,7 @@ Slider {
id: knob
implicitWidth: knobDiameter
implicitHeight: knobDiameter
radius: Math.min(Style.cRadiusL, width / 2)
radius: Math.min(Style.iRadiusL, width / 2)
color: root.pressed ? Color.mHover : Color.mSurface
border.color: fillColor
border.width: Style.borderL
Widgets/NSpinBox.qml
+3 -3
View File
@@ -85,7 +85,7 @@ RowLayout {
id: spinBoxContainer
implicitWidth: 120
implicitHeight: Math.round((root.baseSize - 4) / 2) * 2
radius: Style.cRadiusS
radius: Style.iRadiusS
color: Color.mSurfaceVariant
border.color: (root.hovering || decreaseArea.containsMouse || increaseArea.containsMouse) ? Color.mHover : Color.mOutline
border.width: Style.borderS
@@ -140,7 +140,7 @@ RowLayout {
Rectangle {
width: Math.round(parent.height)
height: parent.height
radius: Math.min(Style.cRadiusL, width / 2)
radius: Math.min(Style.iRadiusL, width / 2)
anchors.left: parent.left
color: decreaseArea.containsMouse ? Color.mHover : Color.transparent
Behavior on color {
@@ -239,7 +239,7 @@ RowLayout {
Rectangle {
width: Math.round(parent.height)
height: parent.height
radius: Math.min(Style.cRadiusL, width / 2)
radius: Math.min(Style.iRadiusL, width / 2)
anchors.right: parent.right
color: increaseArea.containsMouse ? Color.mHover : Color.transparent
Behavior on color {
Widgets/NTabBar.qml
+1 -1
View File
@@ -16,7 +16,7 @@ Rectangle {
Layout.fillWidth: true
implicitHeight: Style.baseWidgetSize + Style.marginXS * 2
color: Color.mSurfaceVariant
radius: Style.cRadiusS
radius: Style.iRadiusS
RowLayout {
id: tabRow
Widgets/NTabButton.qml
+1 -1
View File
@@ -22,7 +22,7 @@ Rectangle {
Layout.fillHeight: true
// Styling
radius: Style.cRadiusXS
radius: Style.iRadiusXS
color: root.checked ? Color.mPrimary : (root.isHovered ? Color.mHover : Color.mSurface)
Behavior on color {
Widgets/NTextInput.qml
+1 -1
View File
@@ -50,7 +50,7 @@ ColumnLayout {
background: Rectangle {
id: frame
radius: Style.cRadiusM
radius: Style.iRadiusM
color: Color.mSurface
border.color: input.activeFocus ? Color.mSecondary : Color.mOutline
border.width: Style.borderS
Widgets/NToggle.qml
+2 -2
View File
@@ -35,7 +35,7 @@ RowLayout {
implicitWidth: Math.round(root.baseSize * .85) * 2
implicitHeight: Math.round(root.baseSize * .5) * 2
radius: Math.min(Style.cRadiusL, height / 2)
radius: Math.min(Style.iRadiusL, height / 2)
color: root.checked ? Color.mPrimary : Color.mSurface
border.color: Color.mOutline
border.width: Style.borderS
@@ -56,7 +56,7 @@ RowLayout {
implicitWidth: Math.round(root.baseSize * 0.4) * 2
implicitHeight: Math.round(root.baseSize * 0.4) * 2
radius: Math.min(Style.cRadiusL, height / 2)
radius: Math.min(Style.iRadiusL, height / 2)
color: root.checked ? Color.mOnPrimary : Color.mPrimary
border.color: root.checked ? Color.mSurface : Color.mSurface
border.width: Style.borderM