ags: sync

.config/ags/widgets/indicators/indicatorvalues.js

@@ -2,34 +2,33 @@
 const { GLib, Gtk } = imports.gi;
 import { App, Service, Utils, Widget } from '../../imports.js';
 import Audio from 'resource:///com/github/Aylur/ags/service/audio.js';
-import Notifications from 'resource:///com/github/Aylur/ags/service/notifications.js';
-const { Box, EventBox, Icon, Scrollable, Label, Button, Revealer } = Widget;
+const { Box, Label, ProgressBar, Revealer } = Widget;
+import { MarginRevealer } from '../../lib/advancedrevealers.js';
 import Brightness from '../../services/brightness.js';
 import Indicator from '../../services/indicator.js';
-import Notification from '../../lib/notification.js';
 
-const OsdValue = (name, labelConnections, progressConnections, props = {}) => Widget.Box({ // Volume
+const OsdValue = (name, labelConnections, progressConnections, props = {}) => Box({ // Volume
     ...props,
     vertical: true,
     className: 'osd-bg osd-value',
     hexpand: true,
     children: [
-        Widget.Box({
+        Box({
             vexpand: true,
             children: [
-                Widget.Label({
+                Label({
                     xalign: 0, yalign: 0, hexpand: true,
                     className: 'osd-label',
                     label: `${name}`,
                 }),
-                Widget.Label({
+                Label({
                     hexpand: false, className: 'osd-value-txt',
                     label: '100',
                     connections: labelConnections,
                 }),
             ]
         }),
-        Widget.ProgressBar({
+        ProgressBar({
             className: 'osd-progress',
             hexpand: true,
             vertical: false,
@@ -58,16 +57,20 @@ const volumeIndicator = OsdValue('Volume',
     }]],
 );
 
-export default () => Widget.Revealer({
+export default () => MarginRevealer({
     transition: 'slide_down',
+    showClass: 'osd-show',
+    hideClass: 'osd-hide',
     connections: [
         [Indicator, (revealer, value) => {
-            revealer.revealChild = (value > -1);
+            if(value > -1) revealer._show(revealer);
+            else revealer._hide(revealer);
         }, 'popup'],
     ],
-    child: Widget.Box({
+    child: Box({
         hpack: 'center',
         vertical: false,
+        className: 'spacing-h--10',
         children: [
             brightnessIndicator,
             volumeIndicator,