matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: matt1432:bb7a001eb8080ad99606a83ffd14ea86fe71a61c
Branches Tags
matt1432:master
matt1432:wezterm
matt1432:no-flakes
matt1432:eww
matt1432:before-nix
matt1432:before-git
..
compare: matt1432:4b3cdd82b98d6ddfece8f59883cb7d3d940fa3b1
Branches Tags
matt1432:master
matt1432:wezterm
matt1432:no-flakes
matt1432:eww
matt1432:before-nix
matt1432:before-git

No commits in common. "bb7a001eb8080ad99606a83ffd14ea86fe71a61c" and "4b3cdd82b98d6ddfece8f59883cb7d3d940fa3b1" have entirely different histories.
bb7a001eb8 ... 4b3cdd82b9

4 changed files with 19 additions and 53 deletions
Show stats Expand all files Collapse all files

35
config/ags/js/misc/drag.js
View file

@ -27,38 +27,23 @@ export const Draggable = ({
let gesture = Gtk.GestureDrag.new(w);
let leftAnim = 'transition: margin 0.5s ease, opacity 0.5s ease; ' +
'margin-left: -' + Number(maxOffset + endMargin) + 'px; ' +
'margin-right: ' + Number(maxOffset + endMargin) + 'px; ' +
'margin-bottom: -70px; margin-top: -70px; opacity: 0;';
let rightAnim = 'transition: margin 0.5s ease, opacity 0.5s ease; ' +
'margin-left: ' + Number(maxOffset + endMargin) + 'px; ' +
'margin-right: -' + Number(maxOffset + endMargin) + 'px; ' +
'margin-bottom: -70px; margin-top: -70px; opacity: 0;';
w.child = Box({
properties: [
['leftAnim', leftAnim],
['rightAnim', rightAnim],
],
children: [
...children,
child,
],
style: leftAnim,
connections: [
[gesture, box => {
var offset = gesture.get_offset()[1];
if (offset >= 0) {
box.setStyle('margin-left: ' + Number(offset + startMargin) + 'px; ' +
box.setStyle('margin-left: ' + Number(offset + startMargin) + 'px; ' +
'margin-right: -' + Number(offset + startMargin) + 'px;');
}
else {
offset = Math.abs(offset);
box.setStyle('margin-right: ' + Number(offset + startMargin) + 'px; ' +
box.setStyle('margin-right: ' + Number(offset + startMargin) + 'px; ' +
'margin-left: -' + Number(offset + startMargin) + 'px;');
}
@ -71,18 +56,22 @@ export const Draggable = ({
if (Math.abs(offset) > maxOffset) {
if (offset > 0) {
box.setStyle(rightAnim);
box.setStyle('transition: margin 0.5s ease, opacity 0.5s ease; ' +
'margin-left: ' + Number(maxOffset + endMargin) + 'px; ' +
'margin-right: -' + Number(maxOffset + endMargin) + 'px; ' +
'margin-bottom: -70px; margin-top: -70px; opacity: 0;');
}
else {
box.setStyle(leftAnim);
box.setStyle('transition: margin 0.5s ease, opacity 0.5s ease; ' +
'margin-left: -' + Number(maxOffset + endMargin) + 'px; ' +
'margin-right: ' + Number(maxOffset + endMargin) + 'px; ' +
'margin-bottom: -70px; margin-top: -70px; opacity: 0;');
}
setTimeout(command, 500);
}
else {
box.setStyle('transition: margin 0.5s ease, opacity 0.5s ease; ' +
'margin-left: ' + startMargin + 'px; ' +
'margin-right: ' + startMargin + 'px; ' +
'margin-bottom: unset; margin-top: unset; opacity: 1;');
box.setStyle('transition: margin 0.5s ease; margin-left: ' + startMargin + 'px; ' +
'margin-right: ' + startMargin + 'px;');
if (w.window)
w.window.set_cursor(Gdk.Cursor.new_from_name(display, 'grab'));
}

4
config/ags/js/notifications/base.js
View file

@ -51,9 +51,9 @@ const NotificationIcon = ({ appEntry, appIcon, image }) => {
});
};
export default ({ id, summary, body, actions, urgency, time, command = i => {}, ...icon }) => Draggable({
export default ({ id, summary, body, actions, urgency, time, ...icon }) => Draggable({
maxOffset: 200,
command: () => command(id),
command: () => Notifications.close(id),
properties: [['hovered', false]],
onHover: w => {
if (!w._hovered) {

7
config/ags/js/notifications/center.js
View file

@ -37,13 +37,10 @@ const NotificationList = () => Box({
if (box.children.length == 0) {
box.children = Notifications.notifications
.reverse()
.map(n => Notification({ ...n, command: i => Notifications.close(i), }));
.map(n => Notification(n));
}
else if (id) {
box.add(Notification({
...Notifications.getNotification(id),
command: i => Notifications.close(i),
}));
box.add(Notification(Notifications.getNotification(id)));
box.show_all();
}

26
config/ags/js/notifications/popup.js
View file

@ -1,8 +1,7 @@
import Notification from './base.js';
const { Notifications } = ags.Service;
const { Box, Revealer, Window } = ags.Widget;
const { timeout, interval } = ags.Utils;
const { source_remove } = imports.gi.GLib;
const { timeout } = ags.Utils;
const Popups = () => Box({
vertical: true,
@ -19,10 +18,6 @@ const Popups = () => Box({
box.get_parent().reveal_child = false;
timeout(200, () => {
if (box._map.get(id).interval) {
source_remove(box._map.get(id).interval);
box._map.get(id).interval = undefined;
}
box._map.get(id)?.destroy();
box._map.delete(id);
});
@ -32,26 +27,11 @@ const Popups = () => Box({
return;
box._map.delete(id);
box._map.set(id, Notification({
...Notifications.getNotification(id),
command: i => Notifications.dismiss(i),
}));
box._map.set(id, Notification(Notifications.getNotification(id)));
box.children = Array.from(box._map.values()).reverse();
timeout(10, () => {
box.get_parent().revealChild = true;
});
box._map.get(id).interval = interval(4500, () => {
if (!box._map.get(id)._hovered) {
box._map.get(id).child.setStyle(box._map.get(id).child._leftAnim);
if (box._map.get(id).interval) {
source_remove(box._map.get(id).interval);
box._map.get(id).interval = undefined;
}
}
});
}],
],
connections: [
@ -61,7 +41,7 @@ const Popups = () => Box({
],
});
const PopupList = ({ transition = 'none' } = {}) => Box({
const PopupList = ({ transition = 'slide_right' } = {}) => Box({
className: 'notifications-popup-list',
style: 'padding: 1px',
children: [