summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>2025-04-28 11:01:48 +1000
committer2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>2025-04-28 11:01:48 +1000
commitf7b0e4665b223d86045110ff3d4704c1a7760a4d (patch)
tree5e71541184bf7b736b99d689e4920dda44eeefd8
parentfeat: anims + box padding (diff)
downloadcaelestia-shell-f7b0e4665b223d86045110ff3d4704c1a7760a4d.tar.gz
caelestia-shell-f7b0e4665b223d86045110ff3d4704c1a7760a4d.tar.bz2
caelestia-shell-f7b0e4665b223d86045110ff3d4704c1a7760a4d.zip
format: conform to qml coding conventions
-rw-r--r--modules/bar/ActiveWindow.qml9
-rw-r--r--modules/bar/Bar.qml11
-rw-r--r--modules/bar/Clock.qml8
-rw-r--r--modules/bar/OsIcon.qml4
-rw-r--r--services/Hyprland.qml4
-rw-r--r--widgets/Box.qml10
-rw-r--r--widgets/BoxLayout.qml12
-rw-r--r--widgets/ClippingBox.qml10
-rw-r--r--widgets/ClippingBoxLayout.qml12
9 files changed, 40 insertions, 40 deletions
diff --git a/modules/bar/ActiveWindow.qml b/modules/bar/ActiveWindow.qml
index f351534..5c75944 100644
--- a/modules/bar/ActiveWindow.qml
+++ b/modules/bar/ActiveWindow.qml
@@ -7,25 +7,26 @@ import QtQuick.Layouts
ClippingBoxLayout {
id: root
+
readonly property color colour: Appearance.colours.pink
animated: true
MaterialIcon {
- Layout.alignment: Qt.AlignCenter
text: Icons.getAppCategoryIcon(Hyprland.activeClient?.class) ?? "desktop_windows"
color: root.colour
- }
- Label {
Layout.alignment: Qt.AlignCenter
+ }
+ Label {
text: Hyprland.activeClient?.title ?? "Desktop"
font.pointSize: Appearance.font.size.smaller
font.family: Appearance.font.family.mono
color: root.colour
-
rotation: root.vertical ? 90 : 0
+
+ Layout.alignment: Qt.AlignCenter
Layout.maximumWidth: root.vertical ? this.implicitHeight : this.implicitWidth
}
}
diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml
index 6e18f50..4015003 100644
--- a/modules/bar/Bar.qml
+++ b/modules/bar/Bar.qml
@@ -15,15 +15,12 @@ Variants {
screen: modelData
namespace: "caelestia-bar"
- // color: Appearance.alpha(Appearance.colours.base, false)
color: "transparent"
- anchors {
- top: true
- left: true
- right: !vertical
- bottom: vertical
- }
+ anchors.top: true
+ anchors.left: true
+ anchors.right: !vertical
+ anchors.bottom: vertical
width: contents.implicitWidth
height: contents.implicitHeight
diff --git a/modules/bar/Clock.qml b/modules/bar/Clock.qml
index 2332f29..99bae22 100644
--- a/modules/bar/Clock.qml
+++ b/modules/bar/Clock.qml
@@ -6,21 +6,23 @@ import QtQuick.Layouts
BoxLayout {
id: root
+
readonly property color colour: Appearance.colours.peach
MaterialIcon {
- Layout.alignment: Qt.AlignCenter
text: "calendar_month"
color: root.colour
+
+ Layout.alignment: Qt.AlignCenter
}
Label {
- Layout.alignment: Qt.AlignCenter
horizontalAlignment: Text.AlignJustify
-
text: root.vertical ? Time.format("hh\nmm") : Time.format("dd/MM/yy hh:mm")
font.pointSize: Appearance.font.size.smaller
font.family: Appearance.font.family.mono
color: root.colour
+
+ Layout.alignment: Qt.AlignCenter
}
}
diff --git a/modules/bar/OsIcon.qml b/modules/bar/OsIcon.qml
index 62ff5e6..028c3c7 100644
--- a/modules/bar/OsIcon.qml
+++ b/modules/bar/OsIcon.qml
@@ -7,11 +7,11 @@ import QtQuick.Layouts
Box {
Label {
- Layout.alignment: Qt.AlignCenter
-
text: Icons.osIcon
font.pointSize: Appearance.font.size.smaller
font.family: Appearance.font.family.mono
color: Appearance.colours.yellow
+
+ Layout.alignment: Qt.AlignCenter
}
}
diff --git a/services/Hyprland.qml b/services/Hyprland.qml
index 2e24989..513d372 100644
--- a/services/Hyprland.qml
+++ b/services/Hyprland.qml
@@ -15,8 +15,6 @@ Singleton {
property HyprlandWorkspace activeWorkspace: null
property HyprlandMonitor focusedMonitor: Hyprland.monitors.values.find(m => m.lastIpcObject.focused) ?? null
- Component.onCompleted: reload()
-
function reload() {
Hyprland.refreshWorkspaces();
Hyprland.refreshMonitors();
@@ -29,6 +27,8 @@ Singleton {
Hyprland.dispatch(request);
}
+ Component.onCompleted: reload()
+
Connections {
target: Hyprland
diff --git a/widgets/Box.qml b/widgets/Box.qml
index 536469e..d93fb69 100644
--- a/widgets/Box.qml
+++ b/widgets/Box.qml
@@ -17,11 +17,6 @@ Rectangle {
readonly property int paddingX: getRealPadding().x
readonly property int paddingY: getRealPadding().y
- color: "transparent"
-
- implicitWidth: childrenRect.width + paddingX
- implicitHeight: childrenRect.height + paddingY
-
function getRealPadding() {
const pad = {};
@@ -49,6 +44,11 @@ Rectangle {
return pad;
}
+ color: "transparent"
+
+ implicitWidth: childrenRect.width + paddingX
+ implicitHeight: childrenRect.height + paddingY
+
onChildrenChanged: {
for (const child of children) {
child.x = Qt.binding(() => paddingLeft);
diff --git a/widgets/BoxLayout.qml b/widgets/BoxLayout.qml
index 12aa4f7..da68409 100644
--- a/widgets/BoxLayout.qml
+++ b/widgets/BoxLayout.qml
@@ -5,6 +5,8 @@ import QtQuick.Layouts
Rectangle {
id: root
+ default property alias children: layout.children
+
property bool vertical: false
property bool homogenous: false
property bool animated: false
@@ -18,11 +20,6 @@ Rectangle {
readonly property int paddingX: getRealPadding().x
readonly property int paddingY: getRealPadding().y
- color: "transparent"
-
- implicitWidth: layout.implicitWidth + paddingX
- implicitHeight: layout.implicitHeight + paddingY
-
function getRealPadding() {
const pad = {};
@@ -50,7 +47,10 @@ Rectangle {
return pad;
}
- default property alias children: layout.children
+ color: "transparent"
+
+ implicitWidth: layout.implicitWidth + paddingX
+ implicitHeight: layout.implicitHeight + paddingY
GridLayout {
id: layout
diff --git a/widgets/ClippingBox.qml b/widgets/ClippingBox.qml
index 1ced873..d0c9b92 100644
--- a/widgets/ClippingBox.qml
+++ b/widgets/ClippingBox.qml
@@ -18,11 +18,6 @@ ClippingRectangle {
readonly property int paddingX: getRealPadding().x
readonly property int paddingY: getRealPadding().y
- color: "transparent"
-
- implicitWidth: childrenRect.width + paddingX
- implicitHeight: childrenRect.height + paddingY
-
function getRealPadding() {
const pad = {};
@@ -50,6 +45,11 @@ ClippingRectangle {
return pad;
}
+ color: "transparent"
+
+ implicitWidth: childrenRect.width + paddingX
+ implicitHeight: childrenRect.height + paddingY
+
onChildrenChanged: {
for (const child of children) {
child.x = Qt.binding(() => paddingLeft);
diff --git a/widgets/ClippingBoxLayout.qml b/widgets/ClippingBoxLayout.qml
index 2b22c8c..e96554c 100644
--- a/widgets/ClippingBoxLayout.qml
+++ b/widgets/ClippingBoxLayout.qml
@@ -6,6 +6,8 @@ import QtQuick.Layouts
ClippingRectangle {
id: root
+ default property alias children: layout.children
+
property bool vertical: false
property bool homogenous: false
property bool animated: false
@@ -19,11 +21,6 @@ ClippingRectangle {
readonly property int paddingX: getRealPadding().x
readonly property int paddingY: getRealPadding().y
- color: "transparent"
-
- implicitWidth: layout.implicitWidth + paddingX
- implicitHeight: layout.implicitHeight + paddingY
-
function getRealPadding() {
const pad = {};
@@ -51,7 +48,10 @@ ClippingRectangle {
return pad;
}
- default property alias children: layout.children
+ color: "transparent"
+
+ implicitWidth: layout.implicitWidth + paddingX
+ implicitHeight: layout.implicitHeight + paddingY
GridLayout {
id: layout