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

qmlformat

Browse source
This commit is contained in:
quadbyte 2025-08-10 14:24:07 -04:00
parent 2f691fc72a
commit 408f9a73a6
3 changed files with 376 additions and 376 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Modules/Bar/Bar.qml
View file

@ -17,7 +17,8 @@ Variants {
screen: modelData screen: modelData
implicitHeight: Style.barHeight * scaling implicitHeight: Style.barHeight * scaling
color: "transparent" color: "transparent"
visible: Settings.data.bar.monitors.includes(modelData.name) || (Settings.data.bar.monitors.length === 0) visible: Settings.data.bar.monitors.includes(modelData.name)
|| (Settings.data.bar.monitors.length === 0)
anchors { anchors {
top: true top: true
@ -51,7 +52,6 @@ Variants {
text: screen.name text: screen.name
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
} }
Row { Row {
@ -62,9 +62,7 @@ Variants {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: Style.marginSmall * scaling spacing: Style.marginSmall * scaling
Workspace { Workspace {}
}
} }
Row { Row {
@ -89,8 +87,8 @@ Variants {
icon: "experiment" icon: "experiment"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
onClicked: function() { onClicked: function () {
demoPanel.isLoaded = !demoPanel.isLoaded; demoPanel.isLoaded = !demoPanel.isLoaded
} }
} }
@ -99,25 +97,21 @@ Variants {
icon: "widgets" icon: "widgets"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
onClicked: function() { onClicked: function () {
// Map this button's center to the screen and open the side panel below it // Map this button's center to the screen and open the side panel below it
const localCenterX = width / 2; const localCenterX = width / 2
const localCenterY = height / 2; const localCenterY = height / 2
const globalPoint = mapToItem(null, localCenterX, localCenterY); const globalPoint = mapToItem(null, localCenterX, localCenterY)
if (sidePanel.isLoaded) if (sidePanel.isLoaded)
sidePanel.isLoaded = false; sidePanel.isLoaded = false
else if (sidePanel.openAt) else if (sidePanel.openAt)
sidePanel.openAt(globalPoint.x, screen); sidePanel.openAt(globalPoint.x, screen)
else else
// Fallback: toggle if API unavailable // Fallback: toggle if API unavailable
sidePanel.isLoaded = true; sidePanel.isLoaded = true
} }
} }
} }
} }
} }
} }

74
Modules/Bar/Battery.qml
View file

@ -15,7 +15,9 @@ Item {
property bool testCharging: false property bool testCharging: false
property var battery: UPower.displayDevice property var battery: UPower.displayDevice
property bool isReady: testMode ? true : (battery && battery.ready && battery.isLaptopBattery && battery.isPresent) property bool isReady: testMode ? true : (battery && battery.ready
&& battery.isLaptopBattery
&& battery.isPresent)
property real percent: testMode ? testPercent : (isReady ? (battery.percentage * 100) : 0) property real percent: testMode ? testPercent : (isReady ? (battery.percentage * 100) : 0)
property bool charging: testMode ? testCharging : (isReady ? battery.state === UPowerDeviceState.Charging : false) property bool charging: testMode ? testCharging : (isReady ? battery.state === UPowerDeviceState.Charging : false)
property bool show: isReady && percent > 0 property bool show: isReady && percent > 0
@ -23,29 +25,29 @@ Item {
// Choose icon based on charge and charging state // Choose icon based on charge and charging state
function batteryIcon() { function batteryIcon() {
if (!show) if (!show)
return ""; return ""
if (charging) if (charging)
return "battery_android_bolt"; return "battery_android_bolt"
if (percent >= 95) if (percent >= 95)
return "battery_android_full"; return "battery_android_full"
// Hardcoded battery symbols // Hardcoded battery symbols
if (percent >= 85) if (percent >= 85)
return "battery_android_6"; return "battery_android_6"
if (percent >= 70) if (percent >= 70)
return "battery_android_5"; return "battery_android_5"
if (percent >= 55) if (percent >= 55)
return "battery_android_4"; return "battery_android_4"
if (percent >= 40) if (percent >= 40)
return "battery_android_3"; return "battery_android_3"
if (percent >= 25) if (percent >= 25)
return "battery_android_2"; return "battery_android_2"
if (percent >= 10) if (percent >= 10)
return "battery_android_1"; return "battery_android_1"
if (percent >= 0) if (percent >= 0)
return "battery_android_0"; return "battery_android_0"
} }
visible: testMode || (isReady && battery.isLaptopBattery) visible: testMode || (isReady && battery.isLaptopBattery)
@ -64,12 +66,12 @@ Item {
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
onEntered: { onEntered: {
pill.showDelayed(); pill.showDelayed()
batteryTooltip.show(); batteryTooltip.show()
} }
onExited: { onExited: {
pill.hide(); pill.hide()
batteryTooltip.show(); batteryTooltip.show()
} }
} }
NTooltip { NTooltip {
@ -78,42 +80,44 @@ Item {
target: pill target: pill
delay: Style.tooltipDelayLong delay: Style.tooltipDelayLong
text: { text: {
let lines = []; let lines = []
if (!root.isReady) { if (!root.isReady) {
return ""; return ""
} }
if (root.battery.timeToEmpty > 0) { if (root.battery.timeToEmpty > 0) {
lines.push("Time left: " + Time.formatVagueHumanReadableTime(root.battery.timeToEmpty)); lines.push("Time left: " + Time.formatVagueHumanReadableTime(
root.battery.timeToEmpty))
} }
if (root.battery.timeToFull > 0) { if (root.battery.timeToFull > 0) {
lines.push("Time until full: " + Time.formatVagueHumanReadableTime(root.battery.timeToFull)); lines.push("Time until full: " + Time.formatVagueHumanReadableTime(
root.battery.timeToFull))
} }
if (root.battery.changeRate !== undefined) { if (root.battery.changeRate !== undefined) {
const rate = root.battery.changeRate; const rate = root.battery.changeRate
if (rate > 0) { if (rate > 0) {
lines.push(root.charging ? "Charging rate: " + rate.toFixed(2) + " W" : "Discharging rate: " + rate.toFixed(2) + " W"); lines.push(
root.charging ? "Charging rate: " + rate.toFixed(
2) + " W" : "Discharging rate: " + rate.toFixed(
2) + " W")
} else if (rate < 0) {
lines.push("Discharging rate: " + Math.abs(rate).toFixed(2) + " W")
} else {
lines.push("Estimating...")
} }
else if (rate < 0) { } else {
lines.push("Discharging rate: " + Math.abs(rate).toFixed(2) + " W"); lines.push(root.charging ? "Charging" : "Discharging")
}
else {
lines.push("Estimating...");
}
}
else {
lines.push(root.charging ? "Charging" : "Discharging");
} }
if (root.battery.healthPercentage !== undefined
if (root.battery.healthPercentage !== undefined && root.battery.healthPercentage > 0) { && root.battery.healthPercentage > 0) {
lines.push("Health: " + Math.round(root.battery.healthPercentage) + "%"); lines.push("Health: " + Math.round(
root.battery.healthPercentage) + "%")
} }
return lines.join("\n"); return lines.join("\n")
} }
} }
} }
} }

56
Widgets/NPill.qml
View file

@ -3,7 +3,7 @@ import QtQuick.Controls
import qs.Services import qs.Services
Item { Item {
id: revealPill id: root
readonly property real scaling: Scaling.scale(screen) readonly property real scaling: Scaling.scale(screen)
@ -15,9 +15,6 @@ Item {
property color iconTextColor: Colors.backgroundPrimary property color iconTextColor: Colors.backgroundPrimary
property color collapsedIconColor: Colors.textPrimary property color collapsedIconColor: Colors.textPrimary
property real sizeMultiplier: 0.8 property real sizeMultiplier: 0.8
property int pillHeight: Style.baseWidgetSize * sizeMultiplier * scaling
property int iconSize: Style.baseWidgetSize * sizeMultiplier * scaling
property int pillPaddingHorizontal: 14 * scaling
property bool autoHide: false property bool autoHide: false
// Internal state // Internal state
@ -25,8 +22,13 @@ Item {
property bool shouldAnimateHide: false property bool shouldAnimateHide: false
// Exposed width logic // Exposed width logic
readonly property int pillOverlap: iconSize / 2 readonly property int pillHeight: Style.baseWidgetSize * sizeMultiplier * scaling
readonly property int maxPillWidth: Math.max(1, textItem.implicitWidth + pillPaddingHorizontal * 2 + pillOverlap) readonly property int iconSize: Style.baseWidgetSize * sizeMultiplier * scaling
readonly property int pillPaddingHorizontal: 14 * scaling
readonly property int pillOverlap: iconSize * 0.5
readonly property int maxPillWidth: Math.max(
1, textItem.implicitWidth
+ pillPaddingHorizontal * 2 + pillOverlap)
signal shown signal shown
signal hidden signal hidden
@ -41,14 +43,14 @@ Item {
x: (iconCircle.x + iconCircle.width / 2) - width x: (iconCircle.x + iconCircle.width / 2) - width
opacity: showPill ? 1 : 0 opacity: showPill ? 1 : 0
color: pillColor color: pillColor
topLeftRadius: pillHeight / 2 topLeftRadius: pillHeight * 0.5
bottomLeftRadius: pillHeight / 2 bottomLeftRadius: pillHeight * 0.5
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
Text { Text {
id: textItem id: textItem
anchors.centerIn: parent anchors.centerIn: parent
text: revealPill.text text: root.text
font.pointSize: Colors.fontSizeSmall * scaling font.pointSize: Colors.fontSizeSmall * scaling
font.family: Settings.data.ui.fontFamily font.family: Settings.data.ui.fontFamily
font.weight: Font.Bold font.weight: Font.Bold
@ -92,7 +94,7 @@ Item {
anchors.centerIn: parent anchors.centerIn: parent
font.family: showPill ? "Material Symbols Rounded" : "Material Symbols Outlined" font.family: showPill ? "Material Symbols Rounded" : "Material Symbols Outlined"
font.pointSize: Colors.fontSizeSmall * scaling font.pointSize: Colors.fontSizeSmall * scaling
text: revealPill.icon text: root.icon
color: showPill ? iconTextColor : collapsedIconColor color: showPill ? iconTextColor : collapsedIconColor
} }
} }
@ -117,11 +119,11 @@ Item {
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
} }
onStarted: { onStarted: {
showPill = true; showPill = true
} }
onStopped: { onStopped: {
delayedHideAnim.start(); delayedHideAnim.start()
shown(); shown()
} }
} }
@ -157,36 +159,36 @@ Item {
easing.type: Easing.InCubic easing.type: Easing.InCubic
} }
onStopped: { onStopped: {
showPill = false; showPill = false
shouldAnimateHide = false; shouldAnimateHide = false
hidden(); hidden()
} }
} }
function show() { function show() {
if (!showPill) { if (!showPill) {
shouldAnimateHide = autoHide; shouldAnimateHide = autoHide
showAnim.start(); showAnim.start()
} else { } else {
hideAnim.stop(); hideAnim.stop()
delayedHideAnim.restart(); delayedHideAnim.restart()
} }
} }
function hide() { function hide() {
if (showPill) { if (showPill) {
hideAnim.start(); hideAnim.start()
} }
showTimer.stop(); showTimer.stop()
} }
function showDelayed() { function showDelayed() {
if (!showPill) { if (!showPill) {
shouldAnimateHide = autoHide; shouldAnimateHide = autoHide
showTimer.start(); showTimer.start()
} else { } else {
hideAnim.stop(); hideAnim.stop()
delayedHideAnim.restart(); delayedHideAnim.restart()
} }
} }
@ -195,7 +197,7 @@ Item {
interval: Style.pillDelay interval: Style.pillDelay
onTriggered: { onTriggered: {
if (!showPill) { if (!showPill) {
showAnim.start(); showAnim.start()
} }
} }
} }