From b8afd954a21cdc907f922fffdc95d1dfa4208232 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Tue, 10 Jun 2025 21:36:33 +0200
Subject: [PATCH 1/2] Update RscInGameUI.hpp

---
 addons/aircraft/RscInGameUI.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/aircraft/RscInGameUI.hpp b/addons/aircraft/RscInGameUI.hpp
index 10d41d70094..d48ac48fa67 100644
--- a/addons/aircraft/RscInGameUI.hpp
+++ b/addons/aircraft/RscInGameUI.hpp
@@ -16,8 +16,6 @@ class RscInGameUI {
         idd = 300;
         controls[] = {"CA_IGUI_elements_group", "CA_VehicleToggles"};
 
-        class VScrollbar;
-        class HScrollbar;
         class CA_IGUI_elements_group: RscControlsGroup {
             idc = 170;
 

From 7bd814a3eee403b739aa697d0f35844cc0d9667c Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Thu, 19 Jun 2025 11:07:20 +0200
Subject: [PATCH 2/2] Update RscInGameUI.hpp

---
 addons/aircraft/RscInGameUI.hpp | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/addons/aircraft/RscInGameUI.hpp b/addons/aircraft/RscInGameUI.hpp
index d48ac48fa67..d5ed754d061 100644
--- a/addons/aircraft/RscInGameUI.hpp
+++ b/addons/aircraft/RscInGameUI.hpp
@@ -5,8 +5,6 @@ class RscPicture;
 class RscOpticsText;
 class RscIGProgress;
 class RscOpticsValue;
-class VScrollbar;
-class HScrollbar;
 class RscLadderPicture;
 class RscControlsGroupNoScrollbars;
 
@@ -16,17 +14,9 @@ class RscInGameUI {
         idd = 300;
         controls[] = {"CA_IGUI_elements_group", "CA_VehicleToggles"};
 
-        class CA_IGUI_elements_group: RscControlsGroup {
+        class CA_IGUI_elements_group: RscControlsGroupNoScrollbars {
             idc = 170;
 
-            class VScrollbar: VScrollbar {
-                width = 0;
-            };
-
-            class HScrollbar: HScrollbar {
-                height = 0;
-            };
-
             x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
             y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
             w = "53.5 * (0.01875 * SafezoneH)";
@@ -175,17 +165,9 @@ class RscInGameUI {
         idd = 300;
         controls[] = {"CA_Zeroing", "CA_IGUI_elements_group", "CA_VehicleToggles"};
 
-        class CA_IGUI_elements_group: RscControlsGroup {
+        class CA_IGUI_elements_group: RscControlsGroupNoScrollbars {
             idc = 170;
 
-            class VScrollbar: VScrollbar {
-                width = 0;
-            };
-
-            class HScrollbar: HScrollbar {
-                height = 0;
-            };
-
             x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
             y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
             w = "53.5 * (0.01875 * SafezoneH)";
@@ -358,16 +340,9 @@ class RscInGameUI {
         idd = 300;
         controls[] = {"WeaponInfoControlsGroupRight", "CA_BackgroundVehicle", "CA_BackgroundVehicleTitle", "CA_BackgroundVehicleTitleDark", "CA_BackgroundFuel", "CA_Vehicle", "CA_VehicleRole", "CA_HitZones", "CA_SpeedBackground", "CA_SpeedUnits", "CA_Speed", "CA_ValueFuel", "CA_AltBackground", "CA_AltUnits", "CA_Alt", "CA_VehicleToggles", "CA_Radar", "DriverOpticsGroup"};
 
-        class DriverOpticsGroup: RscControlsGroup {
+        class DriverOpticsGroup: RscControlsGroupNoScrollbars {
             idc = 392;
 
-            class VScrollbar: VScrollbar {
-                width = 0;
-            };
-
-            class HScrollbar: HScrollbar {
-                height = 0;
-            };
             x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
             y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
             w = "53.5 * (0.01875 * SafezoneH)";