Compare commits

..

9 Commits

6 changed files with 405 additions and 8 deletions

10
Bar.qml
View File

@@ -23,7 +23,7 @@ Scope {
PanelWindow { PanelWindow {
id: win id: win
property double barExclusionZone: 15 property double barExclusionZone: IpcManager.tabletMode ? 35 : 15
property double barMaxHeight: modelData.height property double barMaxHeight: modelData.height
required property var modelData required property var modelData
property HyprlandMonitor monitor: Hyprland.monitorFor(modelData) property HyprlandMonitor monitor: Hyprland.monitorFor(modelData)
@@ -55,6 +55,10 @@ Scope {
Region { Region {
id: maskRegion id: maskRegion
Region {
item: launcher
}
Region { Region {
item: left item: left
} }
@@ -101,6 +105,10 @@ Scope {
top: parent.top top: parent.top
} }
Launcher {
id: launcher
}
Row { Row {
id: left id: left

View File

@@ -22,7 +22,7 @@ Container {
boxHeightOpened: root.batteryDisplayHeight boxHeightOpened: root.batteryDisplayHeight
boxRadius: radius boxRadius: radius
boxWidth: 60 boxWidth: 60
boxWidthOpened: 410 boxWidthOpened: 450
defaultItem: icon defaultItem: icon
exclusiveMonitor: root.monitor exclusiveMonitor: root.monitor
exclusiveToScreen: true exclusiveToScreen: true

194
Bar/Launcher.qml Normal file
View File

@@ -0,0 +1,194 @@
pragma ComponentBehavior: Bound
import QtQuick
import QtQuick.Layouts
import Quickshell
import Quickshell.Hyprland
import "../Color.js" as Colors
import "../Components/"
import "../Services/"
Item {
id: root
property var buttons: [
{
icon: "",
color: Colors.surface1,
action: function () {}
},
{
icon: "",
color: Colors.yellow,
action: function () {
Quickshell.execDetached("nemo");
}
},
{
icon: "󰪶",
color: Colors.green,
action: function () {
Hyprland.dispatch("hl.dsp.exec_cmd('firefox --new-window \"https://office.voidarc.co.uk\"')");
}
},
{
icon: "󰊻",
color: Colors.sky,
action: function () {
Hyprland.dispatch("hl.dsp.exec_cmd('firefox --new-window \"https://teams.cloud.microsoft\"')");
}
},
{
icon: "",
color: Colors.mauve,
action: function () {
Hyprland.dispatch("hl.dsp.exec_cmd('kitty')");
}
},
{
icon: "󰼁",
color: Colors.red,
action: function () {}
},
{
icon: "󰈹",
color: Colors.peach,
action: function () {
Hyprland.dispatch("hl.dsp.exec_cmd('firefox')");
}
}
]
property real cx: width / 2
property real cy: height / 2
property bool hidden: !IpcManager.launcherOpen
property real r: 120
property double topMargin: 50
implicitHeight: 300
implicitWidth: 300
states: [
State {
name: "hidden"
when: root.hidden == true
PropertyChanges {
root.r: 0
root.topMargin: -300
}
},
State {
name: "shown"
when: root.hidden == false
PropertyChanges {
root.r: 120
root.topMargin: 50
}
}
]
transitions: [
Transition {
from: "hidden"
to: "shown"
ParallelAnimation {
SpringAnimation {
damping: 0.3
property: "topMargin"
spring: 5
target: root
}
SequentialAnimation {
PauseAnimation {
duration: 220
}
SpringAnimation {
damping: 0.3
property: "r"
spring: 4
target: root
}
}
}
},
Transition {
from: "shown"
to: "hidden"
ParallelAnimation {
SpringAnimation {
damping: 0.3
property: "r"
spring: 4
target: root
}
SequentialAnimation {
PauseAnimation {
duration: 130
}
NumberAnimation {
duration: 250
easing.type: Easing.InBack
property: "topMargin"
target: root
}
}
}
}
]
anchors {
horizontalCenter: parent.horizontalCenter
top: parent.top
topMargin: root.topMargin
}
Repeater {
model: root.buttons
delegate: Item {
id: itemRoot
required property int index
required property var modelData
x: index === 0 ? root.cx - width / 2 : root.cx + root.r * Math.cos((index - 1) * Math.PI / 3)
- width / 2
y: index === 0 ? root.cy - height / 2 : root.cy + root.r * Math.sin((index - 1) * Math.PI / 3)
- height / 2
z: index === 0 ? 10 : 0
Rectangle {
color: itemRoot.modelData.color
implicitHeight: 80 + (itemRoot.index === 0 ? 2 : 0)
implicitWidth: 80 + (itemRoot.index === 0 ? 2 : 0)
radius: 10
TapHandler {
onTapped: {
itemRoot.modelData.action();
IpcManager.toggleLauncher();
}
}
anchors {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
CenteredText {
color: itemRoot.index === 0 ? Colors.text : Colors.surface0
fontSize: 32
propo: true
text: itemRoot.modelData.icon
}
}
}
}
}

View File

@@ -29,7 +29,8 @@ Container {
property bool notified: false property bool notified: false
boxColor: Colors.mauve boxColor: Colors.mauve
defaultItem: time boxWidth: IpcManager.tabletMode ? 600 : 100
defaultItem: IpcManager.tabletMode ? tabletTime : time
exclusiveMonitor: root.monitor exclusiveMonitor: root.monitor
exclusiveToScreen: true exclusiveToScreen: true
@@ -330,6 +331,140 @@ Container {
} }
} }
Component {
id: tabletTime
Item {
property string component: "tabletTime"
Rectangle {
color: Colors.surface1
radius: root.boxRadius - 2
anchors {
fill: parent
margins: 3
topMargin: 3
}
Component {
id: tabletButton
Rectangle {
id: tabletButtonRoot
required property var modelData
color: Colors.overlay0
implicitWidth: 25
radius: root.boxRadius - 4
Behavior on color {
ColorAnimation {
duration: 60
}
}
anchors {
bottom: parent.bottom
top: parent.top
}
TapHandler {
onTapped: {
tabletButtonRoot.modelData.onTapped();
tabletButtonRoot.color = Colors.text;
tapAnimationTimer.restart();
}
}
Timer {
id: tapAnimationTimer
interval: 80
repeat: false
running: false
onTriggered: {
tabletButtonRoot.color = Colors.overlay0;
}
}
StyledText {
anchors.fill: parent
color: Colors.mauve
fontSize: 14
fontWeight: 10
horizontalAlignment: Qt.AlignHCenter
propo: true
text: tabletButtonRoot.modelData.text
verticalAlignment: Qt.AlignVCenter
}
}
}
Row {
anchors {
bottom: parent.bottom
bottomMargin: 3
left: parent.left
leftMargin: 4
top: parent.top
topMargin: 3
}
Repeater {
delegate: tabletButton
model: [
{
text: "󱗿",
onTapped: function () {
IpcManager.toggleLauncher();
}
},
]
}
}
CenteredText {
color: Colors.mauve
text: TimeManager.time
}
Row {
spacing: 3
anchors {
bottom: parent.bottom
bottomMargin: 3
right: parent.right
rightMargin: 4
top: parent.top
topMargin: 3
}
Repeater {
delegate: tabletButton
model: [
{
text: "",
onTapped: function () {
WorkspaceManager.activateWorkspaceById("-1");
}
},
{
text: "",
onTapped: function () {
Hyprland.dispatch(`hl.dsp.focus({workspace = "+1"})`);
}
},
]
}
}
}
}
}
Component { Component {
id: notification id: notification
@@ -366,7 +501,7 @@ Container {
IconImage { IconImage {
anchors.fill: parent anchors.fill: parent
anchors.margins: 10 anchors.margins: 10
source: root.latestNotif.image source: "file://" + root.latestNotif.appIcon
} }
} }

View File

@@ -5,6 +5,7 @@ import Quickshell
import Quickshell.Hyprland import Quickshell.Hyprland
import "../Color.js" as Colors import "../Color.js" as Colors
import "../Services/"
Item { Item {
id: root id: root
@@ -78,6 +79,7 @@ Item {
State { State {
name: "closed" name: "closed"
when: root.hovered == false && root.boxOpened == false && root.overriden == false when: root.hovered == false && root.boxOpened == false && root.overriden == false
&& IpcManager.tabletMode == false
PropertyChanges { PropertyChanges {
container.radius: root.boxRadius container.radius: root.boxRadius
@@ -91,19 +93,38 @@ Item {
} }
} }
}, },
State {
name: "tablet"
when: ( root.hovered == false || IpcManager.tabletMode == true ) && root.boxOpened == false && root.overriden == false
&& IpcManager.tabletMode == true
PropertyChanges {
container.radius: root.boxRadius
root.implicitHeight: 33
root.implicitWidth: root.boxWidth
}
StateChangeScript {
script: {
stack.replace(root.defaultItem);
}
}
},
State { State {
name: "hovered" name: "hovered"
when: root.hovered == true && root.boxOpened == false && root.overriden == false when: root.hovered == true && root.boxOpened == false && root.overriden == false
PropertyChanges { PropertyChanges {
container.radius: root.boxRadius + 3 container.radius: root.boxRadius + 3
root.implicitHeight: root.boxHeight + 2 root.implicitHeight: IpcManager.tabletMode ? 35 : root.boxHeight + 2
root.implicitWidth: root.boxWidth + 2 root.implicitWidth: root.boxWidth + 2
} }
StateChangeScript { StateChangeScript {
script: { script: {
stack.replace(root.defaultItem); if (IpcManager.tabletMode == false) {
stack.replace(root.defaultItem);
}
} }
} }
}, },
@@ -182,8 +203,11 @@ Item {
} else { } else {
root.hovered = false; root.hovered = false;
root.boxOpened = false; root.boxOpened = false;
if (root.state == "closed") { if (root.state == "closed" || root.state == "tablet") {
root.stack.replace(root.defaultItem); if (IpcManager.tabletMode == false) {
root.stack.replace(root.defaultItem);
console.log("some");
}
} }
} }
} }
@@ -199,6 +223,24 @@ Item {
} }
} }
TapHandler {
id: touchScreenTapHandler
acceptedDevices: PointerDevice.TouchScreen
onGrabChanged: state => {
if (state == 1) {
if (root.openedItem) {
root.hovered = true;
root.boxOpened = true;
}
} else if (state == 2) {
root.hovered = false;
root.boxOpened = false;
}
}
}
Rectangle { Rectangle {
id: container id: container

View File

@@ -9,17 +9,35 @@ Singleton {
id: root id: root
property var focusState: WlrKeyboardFocus.None property var focusState: WlrKeyboardFocus.None
property bool launcherOpen: false
property bool logoutMenuOpen: false property bool logoutMenuOpen: false
property bool tabletMode: false
signal closeLogoutMenu signal closeLogoutMenu
signal enableTabletMode
signal logoutMenu signal logoutMenu
signal normalMode
signal toggleLauncher
onCloseLogoutMenu: { onCloseLogoutMenu: {
root.focusState = WlrKeyboardFocus.None; root.focusState = WlrKeyboardFocus.None;
root.logoutMenuOpen = false; root.logoutMenuOpen = false;
} }
onToggleLauncher: {
root.launcherOpen = root.launcherOpen == true ? false : true;
}
IpcHandler { IpcHandler {
function disableTabletMode(): void {
root.normalMode();
root.tabletMode = false;
}
function enableTabletMode(): void {
root.enableTabletMode();
root.tabletMode = true;
}
function openLogoutMenu(): void { function openLogoutMenu(): void {
root.logoutMenu(); root.logoutMenu();
root.focusState = WlrKeyboardFocus.Exclusive; root.focusState = WlrKeyboardFocus.Exclusive;