Compare commits
No commits in common. "c5859fa87bbc8c03b98c789e8717455e344810ed" and "11f5eecbc2d01acfe62c2bb02a32a8289be3583c" have entirely different histories.
c5859fa87b
...
11f5eecbc2
12 changed files with 229 additions and 237 deletions
|
|
@ -3,7 +3,6 @@ import { Box, Icon, Label } from 'resource:///com/github/Aylur/ags/widget.js';
|
|||
|
||||
const DEFAULT_KB = 'at-translated-set-2-keyboard';
|
||||
|
||||
|
||||
export default () => Box({
|
||||
className: 'toggle-off',
|
||||
css: 'padding: 0 10px;',
|
||||
|
|
|
|||
|
|
@ -2,6 +2,9 @@ import Mpris from 'resource:///com/github/Aylur/ags/service/mpris.js';
|
|||
import { Button, Icon, Label, Stack, Slider, CenterBox, Box } from 'resource:///com/github/Aylur/ags/widget.js';
|
||||
import { execAsync, lookUpIcon, readFileAsync } from 'resource:///com/github/Aylur/ags/utils.js';
|
||||
|
||||
import Gdk from 'gi://Gdk';
|
||||
const display = Gdk.Display.get_default();
|
||||
|
||||
import Separator from '../misc/separator.js';
|
||||
import EventBox from '../misc/cursorbox.js';
|
||||
|
||||
|
|
@ -145,18 +148,24 @@ export const PlayerIcon = (player, { symbolic = true, ...props } = {}) => {
|
|||
});
|
||||
};
|
||||
|
||||
export const PositionSlider = (player, props) => Slider({
|
||||
export const PositionSlider = (player, props) => EventBox({
|
||||
child: Slider({
|
||||
...props,
|
||||
className: 'position-slider',
|
||||
cursor: 'pointer',
|
||||
vpack: 'center',
|
||||
hexpand: true,
|
||||
drawValue: false,
|
||||
onChange: ({ value }) => {
|
||||
player.position = player.length * value;
|
||||
},
|
||||
properties: [['update', slider => {
|
||||
if (!slider.dragging) {
|
||||
if (slider.dragging) {
|
||||
slider.get_parent().window.set_cursor(Gdk.Cursor
|
||||
.new_from_name(display, 'grabbing'));
|
||||
}
|
||||
else {
|
||||
slider.get_parent()?.window?.set_cursor(Gdk.Cursor
|
||||
.new_from_name(display, 'pointer'));
|
||||
|
||||
slider.visible = player.length > 0;
|
||||
if (player.length > 0)
|
||||
slider.value = player.position / player.length;
|
||||
|
|
@ -176,19 +185,17 @@ export const PositionSlider = (player, props) => Slider({
|
|||
`);
|
||||
}
|
||||
}],
|
||||
|
||||
['button-press-event', s => { s.cursor = 'grabbing'; }],
|
||||
['button-release-event', s => { s.cursor = 'pointer'; }],
|
||||
],
|
||||
}),
|
||||
});
|
||||
|
||||
const PlayerButton = ({ player, items, onClick, prop }) => EventBox({
|
||||
child: Button({
|
||||
const PlayerButton = ({ player, items, onClick, prop }) => Button({
|
||||
child: Stack({ items }),
|
||||
onPrimaryClickRelease: () => player[onClick](),
|
||||
properties: [['hovered', false]],
|
||||
onHover: self => {
|
||||
self._hovered = true;
|
||||
self.window.set_cursor(Gdk.Cursor.new_from_name(display, 'pointer'));
|
||||
|
||||
if (prop == 'playBackStatus') {
|
||||
items.forEach(item => {
|
||||
|
|
@ -205,6 +212,7 @@ const PlayerButton = ({ player, items, onClick, prop }) => EventBox({
|
|||
},
|
||||
onHoverLost: self => {
|
||||
self._hovered = false;
|
||||
self.window.set_cursor(null);
|
||||
if (prop == 'playBackStatus') {
|
||||
items.forEach(item => {
|
||||
item[1].setCss(`
|
||||
|
|
@ -258,7 +266,6 @@ const PlayerButton = ({ player, items, onClick, prop }) => EventBox({
|
|||
}
|
||||
}],
|
||||
],
|
||||
}),
|
||||
});
|
||||
|
||||
export const ShuffleButton = player => PlayerButton({
|
||||
|
|
|
|||
|
|
@ -1,55 +1,49 @@
|
|||
import Variable from 'resource:///com/github/Aylur/ags/variable.js';
|
||||
import { Button, EventBox } from 'resource:///com/github/Aylur/ags/widget.js';
|
||||
|
||||
import Gtk from 'gi://Gtk';
|
||||
import Gdk from 'gi://Gdk';
|
||||
const display = Gdk.Display.get_default();
|
||||
|
||||
|
||||
// TODO: wrap in another EventBox for disabled cursor
|
||||
export default ({
|
||||
isButton = false,
|
||||
onPrimaryClickRelease = () => {},
|
||||
reset = true,
|
||||
onHover = () => {},
|
||||
onHoverLost = () => {},
|
||||
...props
|
||||
}) => {
|
||||
// Make this variable to know if the function should
|
||||
// be executed depending on where the click is released
|
||||
const CanRun = Variable(true);
|
||||
|
||||
const properties = {
|
||||
if (!isButton) {
|
||||
return EventBox({
|
||||
...props,
|
||||
cursor: 'pointer',
|
||||
onPrimaryClickRelease: self => {
|
||||
// Every click, do a one shot connect to
|
||||
// CanRun to wait for location of click
|
||||
const id = CanRun.connect('changed', () => {
|
||||
if (CanRun.value)
|
||||
onPrimaryClickRelease(self);
|
||||
onHover: self => {
|
||||
if (!self.child.sensitive || !self.sensitive)
|
||||
self.window.set_cursor(Gdk.Cursor.new_from_name(display, 'not-allowed'));
|
||||
|
||||
CanRun.disconnect(id);
|
||||
});
|
||||
},
|
||||
};
|
||||
|
||||
let widget;
|
||||
if (!isButton)
|
||||
widget = EventBox(properties);
|
||||
else
|
||||
widget = Button(properties);
|
||||
self.window.set_cursor(Gdk.Cursor.new_from_name(display, 'pointer'));
|
||||
|
||||
const gesture = Gtk.GestureLongPress.new(widget);
|
||||
onHover(self);
|
||||
},
|
||||
onHoverLost: self => {
|
||||
if (reset)
|
||||
self.window.set_cursor(null);
|
||||
|
||||
widget.connectTo(gesture, () => {
|
||||
const pointer = gesture.get_point(null);
|
||||
const x = pointer[1];
|
||||
const y = pointer[2];
|
||||
|
||||
if ((!x || !y) || x === 0 && y === 0)
|
||||
return;
|
||||
|
||||
CanRun.value = !(
|
||||
x > widget.get_allocated_width() ||
|
||||
y > widget.get_allocated_height()
|
||||
);
|
||||
}, 'end');
|
||||
|
||||
return widget;
|
||||
onHoverLost(self);
|
||||
},
|
||||
});
|
||||
}
|
||||
else {
|
||||
return Button({
|
||||
...props,
|
||||
onHover: self => {
|
||||
if (!self.child.sensitive || !self.sensitive)
|
||||
self.window.set_cursor(Gdk.Cursor.new_from_name(display, 'not-allowed'));
|
||||
else
|
||||
self.window.set_cursor(Gdk.Cursor.new_from_name(display, 'pointer'));
|
||||
},
|
||||
onHoverLost: self => {
|
||||
if (reset)
|
||||
self.window.set_cursor(null);
|
||||
},
|
||||
});
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -179,6 +179,7 @@ export const Notification = ({
|
|||
label: setTime(notif.time),
|
||||
}),
|
||||
EventBox({
|
||||
reset: false,
|
||||
child: Button({
|
||||
className: 'close-button',
|
||||
vpack: 'start',
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ import { timeout } from 'resource:///com/github/Aylur/ags/utils.js';
|
|||
import { HasNotifs } from './base.js';
|
||||
|
||||
import Gtk from 'gi://Gtk';
|
||||
import Gdk from 'gi://Gdk';
|
||||
const display = Gdk.Display.get_default();
|
||||
|
||||
|
||||
export default ({
|
||||
|
|
@ -18,12 +20,13 @@ export default ({
|
|||
}) => {
|
||||
const widget = EventBox({
|
||||
...props,
|
||||
cursor: 'grab',
|
||||
onHover: self => {
|
||||
self.window.set_cursor(Gdk.Cursor.new_from_name(display, 'grab'));
|
||||
if (!self._hovered)
|
||||
self._hovered = true;
|
||||
},
|
||||
onHoverLost: self => {
|
||||
self.window.set_cursor(null);
|
||||
if (self._hovered)
|
||||
self._hovered = false;
|
||||
},
|
||||
|
|
@ -82,11 +85,9 @@ export default ({
|
|||
// When dragging
|
||||
[gesture, self => {
|
||||
var offset = gesture.get_offset()[1];
|
||||
if (offset === 0)
|
||||
return;
|
||||
|
||||
// Slide right
|
||||
if (offset > 0) {
|
||||
if (offset >= 0) {
|
||||
self.setCss(`
|
||||
margin-top: 0px; margin-bottom: 0px; opacity: 1; transition: none;
|
||||
margin-left: ${Number(offset + startMargin)}px;
|
||||
|
|
@ -106,7 +107,7 @@ export default ({
|
|||
|
||||
// Put a threshold on if a click is actually dragging
|
||||
widget._dragging = Math.abs(offset) > 10;
|
||||
widget.cursor = 'grabbing';
|
||||
widget.window?.set_cursor(Gdk.Cursor.new_from_name(display, 'grabbing'));
|
||||
}, 'drag-update'],
|
||||
|
||||
|
||||
|
|
@ -136,7 +137,8 @@ export default ({
|
|||
}
|
||||
else {
|
||||
self.setCss(defaultStyle);
|
||||
widget.cursor = 'grab',
|
||||
widget.window?.set_cursor(Gdk.Cursor.new_from_name(display, 'grab'));
|
||||
|
||||
widget._dragging = false;
|
||||
}
|
||||
}, 'drag-end'],
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ const SecondRow = () => Row({
|
|||
|
||||
GridButton({
|
||||
command: () => {
|
||||
execAsync(['pactl', 'set-sink-mute', '@DEFAULT_SINK@', 'toggle'])
|
||||
execAsync(['pactl', 'set-source-mute', '@DEFAULT_SOURCE@', 'toggle'])
|
||||
.catch(print);
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,7 @@ import PopupWindow from '../misc/popup.js';
|
|||
import ToggleButton from './toggle-button.js';
|
||||
|
||||
|
||||
const QuickSettingsWidget = () => {
|
||||
const rev = Revealer({
|
||||
transition: 'slide_down',
|
||||
child: Player(),
|
||||
});
|
||||
|
||||
return Box({
|
||||
const QuickSettingsWidget = () => Box({
|
||||
className: 'qs-container',
|
||||
vertical: true,
|
||||
children: [
|
||||
|
|
@ -37,16 +31,18 @@ const QuickSettingsWidget = () => {
|
|||
|
||||
SliderBox(),
|
||||
|
||||
ToggleButton(rev),
|
||||
ToggleButton(),
|
||||
|
||||
],
|
||||
}),
|
||||
|
||||
rev,
|
||||
Revealer({
|
||||
transition: 'slide_down',
|
||||
child: Player(),
|
||||
}),
|
||||
|
||||
],
|
||||
});
|
||||
};
|
||||
});
|
||||
|
||||
export default () => PopupWindow({
|
||||
name: 'quick-settings',
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import Audio from 'resource:///com/github/Aylur/ags/service/audio.js';
|
||||
import { Box, Slider, Icon } from 'resource:///com/github/Aylur/ags/widget.js';
|
||||
import { Box, Slider, Icon, EventBox } from 'resource:///com/github/Aylur/ags/widget.js';
|
||||
|
||||
import { SpeakerIcon } from '../misc/audio-icons.js';
|
||||
|
||||
|
|
@ -22,16 +22,10 @@ export default () => Box({
|
|||
}),
|
||||
|
||||
Slider({
|
||||
cursor: 'pointer',
|
||||
vpack: 'center',
|
||||
connections: [
|
||||
[Audio, slider => {
|
||||
slider.value = Audio.speaker?.volume;
|
||||
}, 'speaker-changed'],
|
||||
|
||||
['button-press-event', s => { s.cursor = 'grabbing'; }],
|
||||
['button-release-event', s => { s.cursor = 'pointer'; }],
|
||||
],
|
||||
connections: [[Audio, slider => {
|
||||
if (Audio.speaker)
|
||||
slider.value = Audio.speaker.volume;
|
||||
}, 'speaker-changed']],
|
||||
onChange: ({ value }) => Audio.speaker.volume = value,
|
||||
max: 0.999,
|
||||
draw_value: false,
|
||||
|
|
@ -49,20 +43,23 @@ export default () => Box({
|
|||
icon: 'display-brightness-symbolic',
|
||||
}),
|
||||
|
||||
Slider({
|
||||
cursor: 'pointer',
|
||||
vpack: 'center',
|
||||
onChange: ({ value }) => Brightness.screen = value,
|
||||
connections: [
|
||||
[Brightness, slider => {
|
||||
slider.value = Brightness.screen;
|
||||
}, 'screen'],
|
||||
|
||||
['button-press-event', s => { s.cursor = 'grabbing'; }],
|
||||
['button-release-event', s => { s.cursor = 'pointer'; }],
|
||||
EventBox({
|
||||
onHover: box => box.child._canChange = false,
|
||||
onHoverLost: box => box.child._canChange = true,
|
||||
child: Slider({
|
||||
properties: [
|
||||
['canChange', true],
|
||||
],
|
||||
onChange: ({ value }) => {
|
||||
Brightness.screen = value;
|
||||
},
|
||||
connections: [[Brightness, slider => {
|
||||
if (slider._canChange)
|
||||
slider.value = Brightness.screen;
|
||||
}, 'screen']],
|
||||
draw_value: false,
|
||||
}),
|
||||
}),
|
||||
],
|
||||
}),
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
import App from 'resource:///com/github/Aylur/ags/app.js';
|
||||
import Mpris from 'resource:///com/github/Aylur/ags/service/mpris.js';
|
||||
import { CenterBox, Icon, ToggleButton } from 'resource:///com/github/Aylur/ags/widget.js';
|
||||
import { Icon, ToggleButton } from 'resource:///com/github/Aylur/ags/widget.js';
|
||||
|
||||
import EventBox from '../misc/cursorbox.js';
|
||||
|
||||
|
||||
export default rev => CenterBox({
|
||||
center_widget: ToggleButton({
|
||||
cursor: 'pointer',
|
||||
export default () => EventBox({
|
||||
child: ToggleButton({
|
||||
setup: self => {
|
||||
// Open at startup if there are players
|
||||
const id = Mpris.connect('changed', () => {
|
||||
|
|
@ -15,6 +16,8 @@ export default rev => CenterBox({
|
|||
},
|
||||
|
||||
connections: [['toggled', self => {
|
||||
const rev = self.get_parent().get_parent().get_parent().children[1];
|
||||
|
||||
if (self.get_active()) {
|
||||
self.get_children()[0]
|
||||
.setCss('-gtk-icon-transform: rotate(0deg);');
|
||||
|
|
@ -33,6 +36,4 @@ export default rev => CenterBox({
|
|||
css: '-gtk-icon-transform: rotate(180deg);',
|
||||
}),
|
||||
}),
|
||||
start_widget: null,
|
||||
end_widget: null,
|
||||
});
|
||||
|
|
|
|||
|
|
@ -132,10 +132,8 @@
|
|||
margin-right: -20px;
|
||||
}
|
||||
|
||||
.slider {
|
||||
min-height: 55px;
|
||||
|
||||
scale {
|
||||
min-height: 55px;
|
||||
min-width: 400px;
|
||||
margin-left: 18px;
|
||||
margin-right: 20px;
|
||||
|
|
@ -165,5 +163,4 @@
|
|||
transition: background-color 0.5s ease-in-out;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,9 +30,7 @@ exec-once = gnome-keyring-daemon --start --components=secrets
|
|||
exec-once = squeekboard
|
||||
|
||||
exec-once = bash -c "sleep 3; ags -t applauncher"
|
||||
|
||||
layerrule = blur, overview
|
||||
layerrule = ignorealpha[0.97], overview ## don't blur corners
|
||||
|
||||
exec-once = wl-paste --watch cliphist store
|
||||
|
||||
|
|
|
|||
36
flake.lock
36
flake.lock
|
|
@ -7,11 +7,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700139529,
|
||||
"narHash": "sha256-q378ba0Ulprd0lC5sroeCSB1mZOHPL7ubKWgLW3o5pY=",
|
||||
"lastModified": 1700082802,
|
||||
"narHash": "sha256-omS799E+BA9l/XUPebVUhwobZDLsdPCyezENZuGsfPI=",
|
||||
"owner": "Aylur",
|
||||
"repo": "ags",
|
||||
"rev": "b47fa9d26b5dcfd02386badf26a54abf1e71310f",
|
||||
"rev": "7a1699f8fc5ddad014510aafd2ccc2bb0bca10d8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -236,11 +236,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700087144,
|
||||
"narHash": "sha256-LJP1RW0hKNWmv2yRhnjkUptMXInKpn/rV6V6ofuZkHU=",
|
||||
"lastModified": 1699783872,
|
||||
"narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "ab1459a1fb646c40419c732d05ec0bf2416d4506",
|
||||
"rev": "280721186ab75a76537713ec310306f0eba3e407",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -278,11 +278,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700137447,
|
||||
"narHash": "sha256-OcE1gFs/Fj2CEhYjx352arsSwZ9Nf63qfuTJ620o0WM=",
|
||||
"lastModified": 1700080364,
|
||||
"narHash": "sha256-5mBLKfqAnJwqImJ+L3Z/GZfxCoRNWwpmHt43Imzr8y0=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "859841f4d1ceb4060dcfcd2a94976805eaa39d62",
|
||||
"rev": "91d6be1f09a0c0eaf585e88d315a7e56cac315a3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -577,11 +577,11 @@
|
|||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700151683,
|
||||
"narHash": "sha256-vHiN0WXfC2gcR85uIkBW0aT6TsF5YXHIlQMjtWnd0ZQ=",
|
||||
"lastModified": 1700068493,
|
||||
"narHash": "sha256-/OIZvqIBZBbWky6/RbRzW6PUfKHuAoeTu5NiVNFwVPA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "3143a9abef90e20862a3579f50c30c3f4ab782a2",
|
||||
"rev": "4746fa1d8365ce32e7b29a797c34d2ca035329b2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -656,11 +656,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1700152588,
|
||||
"narHash": "sha256-TsKkTU3ESgw6A5ZOCKM+OdK1myXbW0w2wu1i9Nbacs8=",
|
||||
"lastModified": 1700072577,
|
||||
"narHash": "sha256-7jriJotHLpP/3jNoPW9Xc0mDKx2lOzOcLnwUfdpa51Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "f20bb77807abae26832480b82199eef67ac81485",
|
||||
"rev": "49a6f64d2b6dcba38a8fb2312315c13e3fe488f1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -676,11 +676,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700102361,
|
||||
"narHash": "sha256-fMQ99BFqM/5mH74ED/IJtOfZs2lLd7uq1RqjOU/7gzU=",
|
||||
"lastModified": 1699911446,
|
||||
"narHash": "sha256-B9QQMakte6f89asJ2koCYBb72Teew+Tyla3z5VKnSKE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nurl",
|
||||
"rev": "ce14a583c615ad9b02236719956ce23be59742b5",
|
||||
"rev": "33e0beb666eae1b771d7aaf265b08725385136da",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
Loading…
Reference in a new issue