Renamed and moved NPill to BarPill.
Pill should not be used outside of the Bar as they rely on bar settings.
This commit is contained in:
parent
3a6bf8d299
commit
a92b4b311a
11 changed files with 26 additions and 16 deletions
|
|
@ -2,6 +2,7 @@ import QtQuick
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import qs.Commons
|
import qs.Commons
|
||||||
import qs.Services
|
import qs.Services
|
||||||
|
import qs.Widgets
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
@ -41,7 +42,7 @@ Item {
|
||||||
|
|
||||||
Component {
|
Component {
|
||||||
id: verticalPillComponent
|
id: verticalPillComponent
|
||||||
NPillVertical {
|
BarPillVertical {
|
||||||
icon: root.icon
|
icon: root.icon
|
||||||
text: root.text
|
text: root.text
|
||||||
suffix: root.suffix
|
suffix: root.suffix
|
||||||
|
|
@ -66,7 +67,7 @@ Item {
|
||||||
|
|
||||||
Component {
|
Component {
|
||||||
id: horizontalPillComponent
|
id: horizontalPillComponent
|
||||||
NPillHorizontal {
|
BarPillHorizontal {
|
||||||
icon: root.icon
|
icon: root.icon
|
||||||
text: root.text
|
text: root.text
|
||||||
suffix: root.suffix
|
suffix: root.suffix
|
||||||
|
|
@ -2,6 +2,7 @@ import QtQuick
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import qs.Commons
|
import qs.Commons
|
||||||
import qs.Services
|
import qs.Services
|
||||||
|
import qs.Widgets
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
@ -2,6 +2,8 @@ import QtQuick
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import qs.Commons
|
import qs.Commons
|
||||||
import qs.Services
|
import qs.Services
|
||||||
|
import qs.Widgets
|
||||||
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
@ -5,6 +5,7 @@ import QtQuick.Layouts
|
||||||
import qs.Commons
|
import qs.Commons
|
||||||
import qs.Services
|
import qs.Services
|
||||||
import qs.Widgets
|
import qs.Widgets
|
||||||
|
import qs.Modules.Bar.Extras
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
@ -81,11 +82,11 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NPill {
|
BarPill {
|
||||||
id: pill
|
id: pill
|
||||||
|
|
||||||
compact: (Settings.data.bar.density === "compact")
|
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)
|
icon: testMode ? BatteryService.getIcon(testPercent, testCharging, true) : BatteryService.getIcon(percent, charging, isReady)
|
||||||
text: (isReady || testMode) ? Math.round(percent) : "-"
|
text: (isReady || testMode) ? Math.round(percent) : "-"
|
||||||
suffix: "%"
|
suffix: "%"
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import qs.Commons
|
||||||
import qs.Modules.SettingsPanel
|
import qs.Modules.SettingsPanel
|
||||||
import qs.Services
|
import qs.Services
|
||||||
import qs.Widgets
|
import qs.Widgets
|
||||||
|
import qs.Modules.Bar.Extras
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
@ -73,11 +74,11 @@ Item {
|
||||||
onTriggered: pill.hide()
|
onTriggered: pill.hide()
|
||||||
}
|
}
|
||||||
|
|
||||||
NPill {
|
BarPill {
|
||||||
id: pill
|
id: pill
|
||||||
|
|
||||||
compact: (Settings.data.bar.density === "compact")
|
compact: (Settings.data.bar.density === "compact")
|
||||||
rightOpen: BarWidgetRegistry.getNPillDirection(root)
|
rightOpen: BarWidgetRegistry.getPillDirection(root)
|
||||||
icon: getIcon()
|
icon: getIcon()
|
||||||
autoHide: false // Important to be false so we can hover as long as we want
|
autoHide: false // Important to be false so we can hover as long as we want
|
||||||
text: {
|
text: {
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ Rectangle {
|
||||||
readonly property bool verticalMode: barPosition === "left" || barPosition === "right"
|
readonly property bool verticalMode: barPosition === "left" || barPosition === "right"
|
||||||
|
|
||||||
implicitWidth: verticalMode ? Math.round(Style.capsuleHeight * scaling) : Math.round(layout.implicitWidth + Style.marginM * 2 * scaling)
|
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)
|
radius: Math.round(Style.radiusS * scaling)
|
||||||
color: Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent
|
color: Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import qs.Commons
|
||||||
import qs.Services
|
import qs.Services
|
||||||
import qs.Widgets
|
import qs.Widgets
|
||||||
import qs.Modules.SettingsPanel
|
import qs.Modules.SettingsPanel
|
||||||
|
import qs.Modules.Bar.Extras
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
@ -43,10 +44,10 @@ Item {
|
||||||
implicitWidth: pill.width
|
implicitWidth: pill.width
|
||||||
implicitHeight: pill.height
|
implicitHeight: pill.height
|
||||||
|
|
||||||
NPill {
|
BarPill {
|
||||||
id: pill
|
id: pill
|
||||||
|
|
||||||
rightOpen: BarWidgetRegistry.getNPillDirection(root)
|
rightOpen: BarWidgetRegistry.getPillDirection(root)
|
||||||
icon: customIcon
|
icon: customIcon
|
||||||
text: _dynamicText
|
text: _dynamicText
|
||||||
compact: (Settings.data.bar.density === "compact")
|
compact: (Settings.data.bar.density === "compact")
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import Quickshell.Io
|
||||||
import qs.Commons
|
import qs.Commons
|
||||||
import qs.Services
|
import qs.Services
|
||||||
import qs.Widgets
|
import qs.Widgets
|
||||||
|
import qs.Modules.Bar.Extras
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
@ -38,12 +39,12 @@ Item {
|
||||||
implicitWidth: pill.width
|
implicitWidth: pill.width
|
||||||
implicitHeight: pill.height
|
implicitHeight: pill.height
|
||||||
|
|
||||||
NPill {
|
BarPill {
|
||||||
id: pill
|
id: pill
|
||||||
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
compact: (Settings.data.bar.density === "compact")
|
compact: (Settings.data.bar.density === "compact")
|
||||||
rightOpen: BarWidgetRegistry.getNPillDirection(root)
|
rightOpen: BarWidgetRegistry.getPillDirection(root)
|
||||||
icon: "keyboard"
|
icon: "keyboard"
|
||||||
autoHide: false // Important to be false so we can hover as long as we want
|
autoHide: false // Important to be false so we can hover as long as we want
|
||||||
text: currentLayout.toUpperCase()
|
text: currentLayout.toUpperCase()
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import qs.Commons
|
||||||
import qs.Modules.SettingsPanel
|
import qs.Modules.SettingsPanel
|
||||||
import qs.Services
|
import qs.Services
|
||||||
import qs.Widgets
|
import qs.Widgets
|
||||||
|
import qs.Modules.Bar.Extras
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
@ -86,9 +87,9 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NPill {
|
BarPill {
|
||||||
id: pill
|
id: pill
|
||||||
rightOpen: BarWidgetRegistry.getNPillDirection(root)
|
rightOpen: BarWidgetRegistry.getPillDirection(root)
|
||||||
icon: getIcon()
|
icon: getIcon()
|
||||||
compact: (Settings.data.bar.density === "compact")
|
compact: (Settings.data.bar.density === "compact")
|
||||||
autoHide: false // Important to be false so we can hover as long as we want
|
autoHide: false // Important to be false so we can hover as long as we want
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import qs.Commons
|
||||||
import qs.Modules.SettingsPanel
|
import qs.Modules.SettingsPanel
|
||||||
import qs.Services
|
import qs.Services
|
||||||
import qs.Widgets
|
import qs.Widgets
|
||||||
|
import qs.Modules.Bar.Extras
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
@ -71,11 +72,11 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NPill {
|
BarPill {
|
||||||
id: pill
|
id: pill
|
||||||
|
|
||||||
compact: (Settings.data.bar.density === "compact")
|
compact: (Settings.data.bar.density === "compact")
|
||||||
rightOpen: BarWidgetRegistry.getNPillDirection(root)
|
rightOpen: BarWidgetRegistry.getPillDirection(root)
|
||||||
icon: getIcon()
|
icon: getIcon()
|
||||||
autoHide: false // Important to be false so we can hover as long as we want
|
autoHide: false // Important to be false so we can hover as long as we want
|
||||||
text: Math.floor(AudioService.volume * 100)
|
text: Math.floor(AudioService.volume * 100)
|
||||||
|
|
|
||||||
|
|
@ -207,7 +207,7 @@ Singleton {
|
||||||
return (widgetMetadata[id] !== undefined) && (widgetMetadata[id].allowUserSettings === true)
|
return (widgetMetadata[id] !== undefined) && (widgetMetadata[id].allowUserSettings === true)
|
||||||
}
|
}
|
||||||
|
|
||||||
function getNPillDirection(widget) {
|
function getPillDirection(widget) {
|
||||||
try {
|
try {
|
||||||
if (widget.section === "left") {
|
if (widget.section === "left") {
|
||||||
return true
|
return true
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue