From 294dfe7d03cd8101bb1799c279a679468fc1544c Mon Sep 17 00:00:00 2001
From: onyx-and-iris <75868496+onyx-and-iris@users.noreply.github.com>
Date: Wed, 5 Oct 2022 23:03:27 +0100
Subject: [PATCH] changes to progressbar level udpates

---
 vmcompact/builders.py  |  2 +-
 vmcompact/channels.py  | 13 +++++++++----
 vmcompact/gainlayer.py | 23 +++++++++++++++++------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/vmcompact/builders.py b/vmcompact/builders.py
index 4188380..d1ebc42 100644
--- a/vmcompact/builders.py
+++ b/vmcompact/builders.py
@@ -226,7 +226,7 @@ class ChannelLabelFrameBuilder(AbstractBuilder):
         """Adds a progress bar widget to a single label frame"""
         self.labelframe.pb = ttk.Progressbar(
             self.labelframe,
-            maximum=100,
+            maximum=72,
             orient="vertical",
             mode="determinate",
             variable=self.labelframe.level,
diff --git a/vmcompact/channels.py b/vmcompact/channels.py
index 541819e..9371587 100644
--- a/vmcompact/channels.py
+++ b/vmcompact/channels.py
@@ -185,9 +185,14 @@ class Strip(ChannelLabelFrame):
         if self.index < self.parent.parent.kind.num_strip:
             if self.target.levels.is_updated:
                 val = max(self.target.levels.prefader)
-                self.level.set(
-                    (0 if self.mute.get() else 100 + val - 18 + self.gain.get())
-                )
+                if _base_values.vban_connected:
+                    self.level.set(
+                        (0 if self.mute.get() else 72 + val - 12 + self.gain.get())
+                    )
+                else:
+                    self.level.set(
+                        (0 if self.mute.get() else 72 + val + self.gain.get())
+                    )
 
 
 class Bus(ChannelLabelFrame):
@@ -208,7 +213,7 @@ class Bus(ChannelLabelFrame):
         if self.index < self.parent.parent.kind.num_bus:
             if self.target.levels.is_updated or self.level.get() != -118:
                 val = max(self.target.levels.all)
-                self.level.set((0 if self.mute.get() else 100 + val - 18))
+                self.level.set((0 if self.mute.get() else 72 + val))
 
 
 class ChannelFrame(ttk.Frame):
diff --git a/vmcompact/gainlayer.py b/vmcompact/gainlayer.py
index b00bb75..76cd8f9 100644
--- a/vmcompact/gainlayer.py
+++ b/vmcompact/gainlayer.py
@@ -154,13 +154,24 @@ class GainLayer(ttk.LabelFrame):
 
         if self.parent.target.strip[self.index].levels.is_updated:
             val = max(self.parent.target.strip[self.index].levels.prefader)
-            self.level.set(
-                (
-                    0
-                    if self.parent.target.strip[self.index].mute or not self.on.get()
-                    else 100 + val - 18 + self.gain.get()
+            if _base_values.vban_connected:
+                self.level.set(
+                    (
+                        0
+                        if self.parent.target.strip[self.index].mute
+                        or not self.on.get()
+                        else 72 + val - 12 + self.gain.get()
+                    )
+                )
+            else:
+                self.level.set(
+                    (
+                        0
+                        if self.parent.target.strip[self.index].mute
+                        or not self.on.get()
+                        else 72 + val + self.gain.get()
+                    )
                 )
-            )
 
     def grid_configure(self):
         [