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

Renamed and moved NPill to BarPill.

Browse source 
Pill should not be used outside of the Bar as they rely on bar settings.
This commit is contained in:
LemmyCook 2025-09-16 22:26:56 -04:00
parent 3a6bf8d299
commit a92b4b311a
11 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Widgets/NPill.qml → Modules/Bar/Extras/BarPill.qml
View file

@ -2,6 +2,7 @@ import QtQuick
import QtQuick.Controls
import qs.Commons
import qs.Services
import qs.Widgets
Item {
id: root
@ -41,7 +42,7 @@ Item {
Component {
id: verticalPillComponent
NPillVertical {
BarPillVertical {
icon: root.icon
text: root.text
suffix: root.suffix
@ -66,7 +67,7 @@ Item {
Component {
id: horizontalPillComponent
NPillHorizontal {
BarPillHorizontal {
icon: root.icon
text: root.text
suffix: root.suffix

1
Widgets/NPillHorizontal.qml → Modules/Bar/Extras/BarPillHorizontal.qml
View file

@ -2,6 +2,7 @@ import QtQuick
import QtQuick.Controls
import qs.Commons
import qs.Services
import qs.Widgets
Item {
id: root

2
Widgets/NPillVertical.qml → Modules/Bar/Extras/BarPillVertical.qml
View file

@ -2,6 +2,8 @@ import QtQuick
import QtQuick.Controls
import qs.Commons
import qs.Services
import qs.Widgets
Item {
id: root

5
Modules/Bar/Widgets/Battery.qml
View file

@ -5,6 +5,7 @@ import QtQuick.Layouts
import qs.Commons
import qs.Services
import qs.Widgets
import qs.Modules.Bar.Extras
Item {
id: root
@ -81,11 +82,11 @@ Item {
}
}
NPill {
BarPill {
id: pill
compact: (Settings.data.bar.density === "compact")
rightOpen: BarWidgetRegistry.getNPillDirection(root)
rightOpen: BarWidgetRegistry.getPillDirection(root)
icon: testMode ? BatteryService.getIcon(testPercent, testCharging, true) : BatteryService.getIcon(percent, charging, isReady)
text: (isReady || testMode) ? Math.round(percent) : "-"
suffix: "%"

5
Modules/Bar/Widgets/Brightness.qml
View file

@ -4,6 +4,7 @@ import qs.Commons
import qs.Modules.SettingsPanel
import qs.Services
import qs.Widgets
import qs.Modules.Bar.Extras
Item {
id: root
@ -73,11 +74,11 @@ Item {
onTriggered: pill.hide()
}
NPill {
BarPill {
id: pill
compact: (Settings.data.bar.density === "compact")
rightOpen: BarWidgetRegistry.getNPillDirection(root)
rightOpen: BarWidgetRegistry.getPillDirection(root)
icon: getIcon()
autoHide: false // Important to be false so we can hover as long as we want
text: {

2
Modules/Bar/Widgets/Clock.qml
View file

@ -40,7 +40,7 @@ Rectangle {
readonly property bool verticalMode: barPosition === "left" || barPosition === "right"
implicitWidth: verticalMode ? Math.round(Style.capsuleHeight * scaling) : Math.round(layout.implicitWidth + Style.marginM * 2 * scaling)
implicitHeight: verticalMode ? Math.round(Style.capsuleHeight * 2.5 * scaling) : Math.round(Style.capsuleHeight * scaling) // Match NPill
implicitHeight: verticalMode ? Math.round(Style.capsuleHeight * 2.5 * scaling) : Math.round(Style.capsuleHeight * scaling) // Match BarPill
radius: Math.round(Style.radiusS * scaling)
color: Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent

5
Modules/Bar/Widgets/CustomButton.qml
View file

@ -6,6 +6,7 @@ import qs.Commons
import qs.Services
import qs.Widgets
import qs.Modules.SettingsPanel
import qs.Modules.Bar.Extras
Item {
id: root
@ -43,10 +44,10 @@ Item {
implicitWidth: pill.width
implicitHeight: pill.height
NPill {
BarPill {
id: pill
rightOpen: BarWidgetRegistry.getNPillDirection(root)
rightOpen: BarWidgetRegistry.getPillDirection(root)
icon: customIcon
text: _dynamicText
compact: (Settings.data.bar.density === "compact")

5
Modules/Bar/Widgets/KeyboardLayout.qml
View file

@ -6,6 +6,7 @@ import Quickshell.Io
import qs.Commons
import qs.Services
import qs.Widgets
import qs.Modules.Bar.Extras
Item {
id: root
@ -38,12 +39,12 @@ Item {
implicitWidth: pill.width
implicitHeight: pill.height
NPill {
BarPill {
id: pill
anchors.verticalCenter: parent.verticalCenter
compact: (Settings.data.bar.density === "compact")
rightOpen: BarWidgetRegistry.getNPillDirection(root)
rightOpen: BarWidgetRegistry.getPillDirection(root)
icon: "keyboard"
autoHide: false // Important to be false so we can hover as long as we want
text: currentLayout.toUpperCase()

5
Modules/Bar/Widgets/Microphone.qml
View file

@ -6,6 +6,7 @@ import qs.Commons
import qs.Modules.SettingsPanel
import qs.Services
import qs.Widgets
import qs.Modules.Bar.Extras
Item {
id: root
@ -86,9 +87,9 @@ Item {
}
}
NPill {
BarPill {
id: pill
rightOpen: BarWidgetRegistry.getNPillDirection(root)
rightOpen: BarWidgetRegistry.getPillDirection(root)
icon: getIcon()
compact: (Settings.data.bar.density === "compact")
autoHide: false // Important to be false so we can hover as long as we want

5
Modules/Bar/Widgets/Volume.qml
View file

@ -6,6 +6,7 @@ import qs.Commons
import qs.Modules.SettingsPanel
import qs.Services
import qs.Widgets
import qs.Modules.Bar.Extras
Item {
id: root
@ -71,11 +72,11 @@ Item {
}
}
NPill {
BarPill {
id: pill
compact: (Settings.data.bar.density === "compact")
rightOpen: BarWidgetRegistry.getNPillDirection(root)
rightOpen: BarWidgetRegistry.getPillDirection(root)
icon: getIcon()
autoHide: false // Important to be false so we can hover as long as we want
text: Math.floor(AudioService.volume * 100)

2
Services/BarWidgetRegistry.qml
View file

@ -207,7 +207,7 @@ Singleton {
return (widgetMetadata[id] !== undefined) && (widgetMetadata[id].allowUserSettings === true)
}
function getNPillDirection(widget) {
function getPillDirection(widget) {
try {
if (widget.section === "left") {
return true