Merge branch 'mixer' into multimerge

Author: Axenide

modules/mixer.py

@@ -40,6 +40,7 @@ def __init__(self, stream, **kwargs):
         self.stream = stream
         self._updating_from_stream = False
         self.set_value(stream.volume / 100)
+        self.set_size_request(-1, 30)  # Fixed height for sliders
 
         self.connect("value-changed", self.on_value_changed)
         stream.connect("changed", self.on_stream_changed)
@@ -86,7 +87,7 @@ def __init__(self, title, **kwargs):
             orientation="v",
             spacing=8,
             h_expand=True,
-            v_expand=True,
+            v_expand=False,  # Prevent vertical stretching
         )
 
         self.title_label = Label(
@@ -101,7 +102,7 @@ def __init__(self, title, **kwargs):
             orientation="v",
             spacing=8,
             h_expand=True,
-            v_expand=True,
+            v_expand=False,  # Prevent vertical stretching
         )
 
         self.add(self.title_label)
@@ -112,12 +113,15 @@ def update_streams(self, streams):
             self.content_box.remove(child)
 
         for stream in streams:
-            # Create container with label and slider
+            label_text = stream.description
+            if hasattr(stream, "type") and "application" in stream.type.lower():
+                label_text = getattr(stream, "name", stream.description)
+
             stream_container = Box(
                 orientation="v",
                 spacing=4,
                 h_expand=True,
-                v_align="center",
+                v_expand=False,  # Prevent vertical stretching
             )
 
             label = Label(
@@ -128,6 +132,7 @@ def update_streams(self, streams):
                 v_align="center",
                 ellipsization="end",
                 max_chars_width=45,
+                height_request=20,  # Fixed height for labels
             )
 
             slider = MixerSlider(stream)
@@ -146,7 +151,7 @@ def __init__(self, **kwargs):
             orientation="v",
             spacing=8,
             h_expand=True,
-            v_expand=True,
+            v_expand=True,  # Allow Mixer to expand to parent height
         )
 
         try:
@@ -166,30 +171,48 @@ def __init__(self, **kwargs):
             orientation="h" if not vertical_mode else "v",
             spacing=8,
             h_expand=True,
-            v_expand=True,
+            v_expand=True,  # Allow main_container to expand
         )
+        self.main_container.set_homogeneous(True)  # Equal sizing for outputs and inputs
 
-        self.main_container.set_homogeneous(True)
-
+        # ScrolledWindow for Outputs
+        self.outputs_scrolled = ScrolledWindow(
+            name="outputs-scrolled",
+            h_expand=True,
+            v_expand=False,  # Prevent vertical expansion
+            vscrollbar_policy=Gtk.PolicyType.AUTOMATIC,  # Vertical scrollbar when needed
+            hscrollbar_policy=Gtk.PolicyType.NEVER,      # Disable horizontal scrollbar
+        )
         self.outputs_section = MixerSection("Outputs")
-        self.inputs_section = MixerSection("Inputs")
-
-        self.main_container.add(self.outputs_section)
-        self.main_container.add(self.inputs_section)
+        self.outputs_scrolled.add(self.outputs_section)
+        self.outputs_scrolled.set_size_request(-1, 150)  # Fixed height of 150px
+        self.outputs_scrolled.set_max_content_height(150)  # Enforce max height
 
-        self.scrolled = ScrolledWindow(
+        # ScrolledWindow for Inputs
+        self.inputs_scrolled = ScrolledWindow(
+            name="inputs-scrolled",
             h_expand=True,
-            v_expand=True,
-            child=self.main_container,
+            v_expand=False,  # Prevent vertical expansion
+            vscrollbar_policy=Gtk.PolicyType.AUTOMATIC,  # Vertical scrollbar when needed
+            hscrollbar_policy=Gtk.PolicyType.NEVER,      # Disable horizontal scrollbar
         )
+        self.inputs_section = MixerSection("Inputs")
+        self.inputs_scrolled.add(self.inputs_section)
+        self.inputs_scrolled.set_size_request(-1, 150)  # Fixed height of 150px
+        self.inputs_scrolled.set_max_content_height(150)  # Enforce max height
+
+        self.main_container.add(self.outputs_scrolled)
+        self.main_container.add(self.inputs_scrolled)
 
-        self.add(self.scrolled)
+        self.add(self.main_container)
+        self.set_size_request(-1, 300)  # Optional: Set total height to 300px (150px per section)
 
         self.audio.connect("changed", self.on_audio_changed)
         self.audio.connect("stream-added", self.on_audio_changed)
         self.audio.connect("stream-removed", self.on_audio_changed)
 
         self.update_mixer()
+        self.show_all()
 
     def on_audio_changed(self, *args):
         self.update_mixer()