new icon selection utility for icons from ranges

src/panel/meson.build

@@ -38,7 +38,6 @@ deps = [
 if libpulse.found()
   widget_sources += [
     'widgets/volume.cpp',
-    'widgets/volume-level.cpp',
   ]
   deps += [libpulse, libgvc]
 else
@@ -50,7 +49,6 @@ if wireplumber.found()
     'widgets/wp-mixer/wp-mixer.cpp',
     'widgets/wp-mixer/wf-wp-control.cpp',
     'widgets/wp-mixer/wp-common.cpp',
-    'widgets/volume-level.cpp',
   ]
   deps += [pipewire, wireplumber]
 else

src/panel/widgets/volume.cpp

@@ -1,18 +1,20 @@
 #include <gtkmm.h>
 #include <glibmm.h>
+
 #include "volume.hpp"
+#include "icon-select.hpp"
 
-#include "volume-level.hpp"
+#define ICON(volume) icon_from_range(volume_icons, volume)
 
 void WayfireVolume::update_icon()
 {
     if (gvc_stream && gvc_mixer_stream_get_is_muted(gvc_stream))
     {
-        main_image.set_from_icon_name(volume_icon_for(0)); // mute
+        main_image.set_from_icon_name(ICON(0)); // mute
         return;
     }
 
-    main_image.set_from_icon_name(volume_icon_for(volume_scale.get_target_value() / (double)max_norm));
+    main_image.set_from_icon_name(ICON(volume_scale.get_target_value() / (double)max_norm));
 }
 
 bool WayfireVolume::on_popover_timeout(int timer)

src/panel/widgets/wp-mixer/wf-wp-control.cpp

@@ -2,7 +2,9 @@
 #include <gtkmm.h>
 
 #include "wf-wp-control.hpp"
-#include "../volume-level.hpp"
+#include "icon-select.hpp"
+
+#define ICON(volume) icon_from_range(volume_icons, volume)
 
 WfWpControl::WfWpControl(WpPipewireObject *obj, WayfireWpMixer *parent_widget)
 {
@@ -143,12 +145,12 @@ void WfWpControl::update_icon()
     if (button.get_active())
     {
         add_css_class("muted");
-        volume_icon.set_from_icon_name(volume_icon_for(0)); // mute
+        volume_icon.set_from_icon_name(ICON(0)); // mute
         return;
     }
 
     remove_css_class("muted");
-    volume_icon.set_from_icon_name(volume_icon_for(get_scale_target_value()));
+    volume_icon.set_from_icon_name(ICON(get_scale_target_value()));
 }
 
 double WfWpControl::get_scale_target_value()

src/panel/widgets/wp-mixer/wp-mixer.cpp

@@ -4,7 +4,9 @@
 
 #include "wp-mixer.hpp"
 #include "wf-wp-control.hpp"
-#include "../volume-level.hpp"
+#include "icon-select.hpp"
+
+#define ICON(volume) icon_from_range(volume_icons, volume)
 
 bool WayfireWpMixer::on_popover_timeout(int timer)
 {
@@ -332,17 +334,17 @@ void WayfireWpMixer::update_icon()
     // depends on quick_target widget
     if (!quick_target)
     {
-        main_image.set_from_icon_name(volume_icon_for(-1)); // OOR
+        main_image.set_from_icon_name(ICON(-1)); // OOR
         return;
     }
 
     if (quick_target->button.get_active())
     {
-        main_image.set_from_icon_name(volume_icon_for(0)); // mute
+        main_image.set_from_icon_name(ICON(0)); // mute
         return;
     }
 
-    main_image.set_from_icon_name(volume_icon_for(quick_target->get_scale_target_value()));
+    main_image.set_from_icon_name(ICON(quick_target->get_scale_target_value()));
 }
 
 void WayfireWpMixer::set_quick_target_from(WfWpControl *from)

src/util/icon-select.cpp

@@ -0,0 +1,14 @@
+#include "icon-select.hpp"
+
+std::string icon_from_range(std::map<double, std::string> icons, double value)
+{
+    for (auto pair : icons)
+    {
+        if (value <= pair.first)
+        {
+            return pair.second;
+        }
+    }
+
+    return "";
+}

src/util/icon-select.hpp

@@ -0,0 +1,17 @@
+#include <map>
+#include <string>
+#include <limits>
+
+std::string icon_from_range(std::map<double, std::string> icons, double value);
+
+// the number in the first term is the maximal value at which this icon will be shown
+// selection values of the tables are expected to be ordered from least to greatest
+
+const std::map<double, std::string> volume_icons = {
+    {std::numeric_limits<double>::min(), "emblem-unreadable"},
+    {0.0, "audio-volume-muted"},
+    {1.0 / 3, "audio-volume-low"},
+    {(1.0 / 3) * 2, "audio-volume-medium"},
+    {1.0, "audio-volume-high"},
+    {std::numeric_limits<double>::max(), "audio-volume-high-danger-symbolic"}
+};

src/util/meson.build

@@ -2,13 +2,15 @@ util = static_library(
     'util',
     [
         'gtk-utils.cpp',
+        'icon-select.cpp',
         'wf-shell-app.cpp',
         'wf-autohide-window.cpp',
         'wf-popover.cpp',
         'css-config.cpp',
         'wf-ipc.cpp',
         'animated-scale.cpp',
         'background-gl.cpp',
+        'icon-select.cpp'
     ],
     dependencies: [wf_protos, gtklayershell, wayland_client, gtkmm, wfconfig, libinotify, json],
 )