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

Merge branch 'main' of https://github.com/noctalia-dev/noctalia-shell

Browse source
This commit is contained in:
Ly-sec 2025-09-14 20:38:32 +02:00
commit 3956461254
3 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Commons/Style.qml
View file

@ -66,7 +66,7 @@ Singleton {
property int animationSlowest: Math.round(750 / Settings.data.general.animationSpeed) property int animationSlowest: Math.round(750 / Settings.data.general.animationSpeed)
// Dimensions // Dimensions
property int barHeight: (Settings.data.bar.position === "left" || Settings.data.bar.position === "right") ? 39 : 36 property int barHeight: (Settings.data.bar.position === "left" || Settings.data.bar.position === "right") ? 39 : 37
property int capsuleHeight: (barHeight * 0.73) property int capsuleHeight: (barHeight * 0.73)
property int baseWidgetSize: (barHeight * 0.9) property int baseWidgetSize: (barHeight * 0.9)
property int sliderWidth: 200 property int sliderWidth: 200

3
Modules/Bar/Bar.qml
View file

@ -97,7 +97,6 @@ Variants {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: Style.marginM * root.scaling anchors.topMargin: Style.marginM * root.scaling
width: parent.width
Repeater { Repeater {
model: Settings.data.bar.widgets.left model: Settings.data.bar.widgets.left
@ -121,7 +120,6 @@ Variants {
spacing: Style.marginS * root.scaling spacing: Style.marginS * root.scaling
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: parent.width
Repeater { Repeater {
model: Settings.data.bar.widgets.center model: Settings.data.bar.widgets.center
@ -146,7 +144,6 @@ Variants {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: Style.marginM * root.scaling anchors.bottomMargin: Style.marginM * root.scaling
width: parent.width
Repeater { Repeater {
model: Settings.data.bar.widgets.right model: Settings.data.bar.widgets.right

5
Widgets/NIconButton.qml
View file

@ -9,7 +9,6 @@ Rectangle {
// Multiplier to control how large the button container is relative to Style.baseWidgetSize // Multiplier to control how large the button container is relative to Style.baseWidgetSize
property real sizeRatio: 1.0 property real sizeRatio: 1.0
readonly property real size: Style.baseWidgetSize * sizeRatio * scaling
property string icon property string icon
property string tooltipText property string tooltipText
@ -30,8 +29,8 @@ Rectangle {
signal rightClicked signal rightClicked
signal middleClicked signal middleClicked
implicitWidth: Style.baseWidgetSize * scaling * sizeRatio implicitWidth: Math.round(Style.baseWidgetSize * scaling * sizeRatio)
implicitHeight: Style.baseWidgetSize * scaling * sizeRatio implicitHeight: Math.round(Style.baseWidgetSize * scaling * sizeRatio)
opacity: root.enabled ? Style.opacityFull : Style.opacityMedium opacity: root.enabled ? Style.opacityFull : Style.opacityMedium
color: root.enabled && root.hovering ? colorBgHover : colorBg color: root.enabled && root.hovering ? colorBgHover : colorBg