From 2359ce05dea02cf40a6f3d970039aca202a4b981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Fri, 29 Dec 2023 12:42:52 -0800
Subject: [PATCH] Add volume levelbar inline

---
 data/indicator.css             | 21 +++++++++++++++++++
 src/Indicator.vala             |  1 +
 src/Widgets/DisplayWidget.vala | 37 ++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+)

diff --git a/data/indicator.css b/data/indicator.css
index 5e723d6e..b57d0cd4 100644
--- a/data/indicator.css
+++ b/data/indicator.css
@@ -3,6 +3,27 @@
  * SPDX-FileCopyrightText: 2019-2023 elementary, Inc. (https://elementary.io)
  */
 
+.composited-indicator levelbar.horizontal block {
+   min-height: 4px;
+}
+
+.composited-indicator levelbar.horizontal trough {
+    box-shadow:
+        0 0 2px alpha(black, 0.3),
+        0 1px 2px alpha(black, 0.6);
+    min-width: 64px;
+}
+
+.composited-indicator levelbar block.filled {
+    background: white;
+}
+
+.composited-indicator levelbar block {
+    background: alpha(white, 0.35);
+    border: none;
+    box-shadow: none;
+}
+
 .mic-icon {
     animation: none;
     min-width: 24px;
diff --git a/src/Indicator.vala b/src/Indicator.vala
index fa0e33b5..6063d592 100644
--- a/src/Indicator.vala
+++ b/src/Indicator.vala
@@ -154,6 +154,7 @@ public class Sound.Indicator : Wingpanel.Indicator {
         if (volume != volume_scale.scale_widget.get_value ()) {
             volume_scale.scale_widget.set_value (volume);
             display_widget.icon_name = get_volume_icon (volume);
+            display_widget.volume = volume;
         }
     }
 
diff --git a/src/Widgets/DisplayWidget.vala b/src/Widgets/DisplayWidget.vala
index e9d9bfc6..36d8baef 100644
--- a/src/Widgets/DisplayWidget.vala
+++ b/src/Widgets/DisplayWidget.vala
@@ -18,6 +18,7 @@
 public class DisplayWidget : Gtk.Box {
     public bool show_mic { get; set; }
     public bool mic_muted { get; set; }
+    public double volume { get; set; }
     public string icon_name { get; set; }
 
     public signal void volume_scroll_event (Gdk.EventScroll e);
@@ -26,6 +27,8 @@ public class DisplayWidget : Gtk.Box {
     public signal void volume_press_event (Gdk.EventButton e);
     public signal void mic_press_event (Gdk.EventButton e);
 
+    private uint volume_timeout = 0;
+
     construct {
         var provider = new Gtk.CssProvider ();
         provider.load_from_resource ("io/elementary/wingpanel/sound/indicator.css");
@@ -34,6 +37,17 @@ public class DisplayWidget : Gtk.Box {
             pixel_size = 24
         };
 
+        var volume_levelbar = new Gtk.LevelBar () {
+            valign = CENTER
+        };
+        volume_levelbar.get_style_context ().add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+        var volume_levelbar_revealer = new Gtk.Revealer () {
+            child = volume_levelbar,
+            reveal_child = false,
+            transition_type = SLIDE_LEFT
+        };
+
         var mic_icon = new Gtk.Spinner () {
             margin_end = 18
         };
@@ -50,6 +64,7 @@ public class DisplayWidget : Gtk.Box {
         valign = Gtk.Align.CENTER;
         add (mic_revealer);
         add (volume_icon);
+        add (volume_levelbar_revealer);
 
         /* SMOOTH_SCROLL_MASK has no effect on this widget for reasons that are not
          * entirely clear. Only normal scroll events are received even if the SMOOTH_SCROLL_MASK
@@ -89,6 +104,13 @@ public class DisplayWidget : Gtk.Box {
             GLib.BindingFlags.BIDIRECTIONAL | GLib.BindingFlags.SYNC_CREATE
         );
 
+        bind_property (
+            "volume",
+            volume_levelbar,
+            "value",
+            SYNC_CREATE
+        );
+
         notify["mic-muted"].connect (() => {
             if (mic_muted) {
                 mic_style_context.add_class ("disabled");
@@ -96,5 +118,20 @@ public class DisplayWidget : Gtk.Box {
                 mic_style_context.remove_class ("disabled");
             }
         });
+
+        notify["volume"].connect (() => {
+            if (volume_timeout != 0) {
+                Source.remove (volume_timeout);
+                volume_timeout = 0;
+            }
+
+            volume_levelbar_revealer.reveal_child = true;
+
+            if (volume_timeout == 0) {
+                volume_timeout = Timeout.add_seconds (1, () => {
+                    volume_levelbar_revealer.reveal_child = false;
+                });
+            }
+        });
     }
 }