From 82c8e39dfd3174e7f97e87fc178443e15fe55d99 Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Fri, 12 Jan 2024 17:23:10 -0600 Subject: [PATCH 1/2] Fix `AlwaysShowScrollbars` to update enabled state of the scroll bars. #2165 --- Source/Engine/UI/GUI/Panels/Panel.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Source/Engine/UI/GUI/Panels/Panel.cs b/Source/Engine/UI/GUI/Panels/Panel.cs index bae165fba..d660d7b6f 100644 --- a/Source/Engine/UI/GUI/Panels/Panel.cs +++ b/Source/Engine/UI/GUI/Panels/Panel.cs @@ -132,6 +132,22 @@ namespace FlaxEngine.GUI if (_alwaysShowScrollbars != value) { _alwaysShowScrollbars = value; + switch (_scrollBars) + { + case ScrollBars.None: + break; + case ScrollBars.Horizontal: + HScrollBar.Enabled = true; + break; + case ScrollBars.Vertical: + VScrollBar.Enabled = true; + break; + case ScrollBars.Both: + HScrollBar.Enabled = true; + VScrollBar.Enabled = true; + break; + default: break; + } PerformLayout(); } } From 503bcdcf2795f535e92dcd640560e3dcb06a744b Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Fri, 12 Jan 2024 19:57:00 -0600 Subject: [PATCH 2/2] Change visibility instead of enable on scroll bars. --- Source/Engine/UI/GUI/Panels/Panel.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Engine/UI/GUI/Panels/Panel.cs b/Source/Engine/UI/GUI/Panels/Panel.cs index d660d7b6f..05cb9bd80 100644 --- a/Source/Engine/UI/GUI/Panels/Panel.cs +++ b/Source/Engine/UI/GUI/Panels/Panel.cs @@ -137,14 +137,14 @@ namespace FlaxEngine.GUI case ScrollBars.None: break; case ScrollBars.Horizontal: - HScrollBar.Enabled = true; + HScrollBar.Visible = value; break; case ScrollBars.Vertical: - VScrollBar.Enabled = true; + VScrollBar.Visible = value; break; case ScrollBars.Both: - HScrollBar.Enabled = true; - VScrollBar.Enabled = true; + HScrollBar.Visible = value; + VScrollBar.Visible = value; break; default: break; }