From 72abb2bcd1688a3f56845b4da52c21da6988c9a0 Mon Sep 17 00:00:00 2001
From: Bryan Biedenkapp <gatekeep@gmail.com>
Date: Thu, 20 Mar 2025 13:58:57 -0400
Subject: [PATCH] fix scrollbar offsets;

---
 dvmconsole/MainWindow.xaml.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/dvmconsole/MainWindow.xaml.cs b/dvmconsole/MainWindow.xaml.cs
index 34d5025..ddc73c3 100644
--- a/dvmconsole/MainWindow.xaml.cs
+++ b/dvmconsole/MainWindow.xaml.cs
@@ -1209,6 +1209,9 @@ namespace dvmconsole
         /// <param name="e"></param>
         private void MainWindow_Loaded(object sender, RoutedEventArgs e)
         {
+            const double widthOffset = 16;
+            const double heightOffset = 115;
+
             if (!string.IsNullOrEmpty(settingsManager.LastCodeplugPath) && File.Exists(settingsManager.LastCodeplugPath))
                 LoadCodeplug(settingsManager.LastCodeplugPath);
             else
@@ -1225,10 +1228,17 @@ namespace dvmconsole
             {
                 Width = settingsManager.WindowWidth;
                 channelsCanvas.Width = settingsManager.CanvasWidth;
-                canvasScrollViewer.Width = Width;
+                if (settingsManager.CanvasWidth > settingsManager.WindowWidth)
+                    canvasScrollViewer.Width = Width - widthOffset;
+                else
+                    canvasScrollViewer.Width = Width;
+
                 Height = settingsManager.WindowHeight;
                 channelsCanvas.Height = settingsManager.CanvasHeight;
-                canvasScrollViewer.Height = Height;
+                if (settingsManager.CanvasHeight > settingsManager.WindowHeight)
+                    canvasScrollViewer.Height = Height - heightOffset;
+                else
+                    canvasScrollViewer.Height = Height;
 
                 windowLoaded = true;
             }