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

feat(ags notifs): separate height and slide anims for cleaner anims of notifs

Browse source
This commit is contained in:
matt1432 2023-09-21 00:27:58 -04:00
parent c129c6779c
commit 8298e0bf97
3 changed files with 53 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
const { Window, Box, EventBox, Button } = ags.Widget; const { Box, EventBox } = ags.Widget;
const { Gtk, Gdk } = imports.gi; const { Gtk, Gdk } = imports.gi;
const display = Gdk.Display.get_default(); const display = Gdk.Display.get_default();
@ -32,26 +32,39 @@ export const Draggable = ({
let gesture = Gtk.GestureDrag.new(w); let gesture = Gtk.GestureDrag.new(w);
let leftAnim = 'transition: margin 0.5s ease, opacity 0.5s ease; ' + let leftAnim1 = `transition: margin 0.5s ease, opacity 0.5s ease;
'margin-left: -' + Number(maxOffset + endMargin) + 'px; ' + margin-left: -${Number(maxOffset + endMargin)}px;
'margin-right: ' + Number(maxOffset + endMargin) + 'px; ' + margin-right: ${Number(maxOffset + endMargin)}px;
'margin-bottom: -70px; margin-top: -70px; opacity: 0;'; opacity: 0;`;
let rightAnim = 'transition: margin 0.5s ease, opacity 0.5s ease; ' + let leftAnim2 = `transition: margin 0.5s ease, opacity 0.5s ease;
'margin-left: ' + Number(maxOffset + endMargin) + 'px; ' + margin-left: -${Number(maxOffset + endMargin)}px;
'margin-right: -' + Number(maxOffset + endMargin) + 'px; ' + margin-right: ${Number(maxOffset + endMargin)}px;
'margin-bottom: -70px; margin-top: -70px; opacity: 0;'; margin-bottom: -70px; margin-top: -70px; opacity: 0;`;
let rightAnim1 = `transition: margin 0.5s ease, opacity 0.5s ease;
margin-left: ${Number(maxOffset + endMargin)}px;
margin-right: -${Number(maxOffset + endMargin)}px;
opacity: 0;`;
let rightAnim2 = `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({ w.child = Box({
properties: [ properties: [
['leftAnim', leftAnim], ['leftAnim1', leftAnim1],
['rightAnim', rightAnim], ['leftAnim2', leftAnim2],
['rightAnim1', rightAnim1],
['rightAnim2', rightAnim2],
['ready', false]
], ],
children: [ children: [
...children, ...children,
child, child,
], ],
style: leftAnim, style: leftAnim2,
connections: [ connections: [
[gesture, box => { [gesture, box => {
@ -74,16 +87,37 @@ export const Draggable = ({
}, 'drag-update'], }, 'drag-update'],
[gesture, box => { [gesture, box => {
if (!box._ready) {
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: 0px; margin-top: 0px; opacity: 0;`);
setTimeout(() => {
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;');
}, 500);
setTimeout(() => box._ready = true, 1000);
return;
}
const offset = gesture.get_offset()[1]; const offset = gesture.get_offset()[1];
if (Math.abs(offset) > maxOffset) { if (Math.abs(offset) > maxOffset) {
if (offset > 0) { if (offset > 0) {
box.setStyle(rightAnim); box.setStyle(rightAnim1);
setTimeout(() => box.setStyle(rightAnim2), 500);
} }
else { else {
box.setStyle(leftAnim); box.setStyle(leftAnim1);
setTimeout(() => box.setStyle(leftAnim2), 500);
} }
setTimeout(command, 500); setTimeout(() => {
command();
box.destroy();
}, 1000);
} }
else { else {
box.setStyle('transition: margin 0.5s ease, opacity 0.5s ease; ' + box.setStyle('transition: margin 0.5s ease, opacity 0.5s ease; ' +

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

@ -9,9 +9,9 @@ import { EventBox } from '../misc/cursorbox.js'
const ClearButton = () => EventBox({ const ClearButton = () => EventBox({
child: Button({ child: Button({
onPrimaryClickRelease: button => { onPrimaryClickRelease: button => {
button._popups.children.forEach(ch => ch.child.setStyle(ch.child._leftAnim)); button._popups.children.forEach(ch => ch.child.setStyle(ch.child._leftAnim1));
button._notifList.children.forEach(ch => { button._notifList.children.forEach(ch => {
ch.child.setStyle(ch.child._rightAnim); ch.child.setStyle(ch.child._rightAnim1);
timeout(500, () => { timeout(500, () => {
button._notifList.remove(ch); button._notifList.remove(ch);
Notifications.close(ch._id); Notifications.close(ch._id);
@ -77,7 +77,7 @@ const NotificationList = () => Box({
[Notifications, (box, id) => { [Notifications, (box, id) => {
for (const ch of box.children) { for (const ch of box.children) {
if (ch._id == id) { if (ch._id == id) {
ch.child.setStyle(ch.child._rightAnim); ch.child.setStyle(ch.child._rightAnim1);
timeout(500, () => box.remove(ch)); timeout(500, () => box.remove(ch));
return; return;
} }

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

@ -47,7 +47,7 @@ const Popups = () => Box({
}); });
box._map.get(id).interval = interval(4500, () => { box._map.get(id).interval = interval(4500, () => {
if (!box._map.get(id)._hovered) { if (!box._map.get(id)._hovered) {
box._map.get(id).child.setStyle(box._map.get(id).child._leftAnim); box._map.get(id).child.setStyle(box._map.get(id).child._leftAnim1);
if (box._map.get(id).interval) { if (box._map.get(id).interval) {
source_remove(box._map.get(id).interval); source_remove(box._map.get(id).interval);