From 8d4d8f227d5975e5e88ed5c630fcc6e21371aae5 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sun, 15 Oct 2023 23:30:43 -0700 Subject: [PATCH] ensure modal dialogs behave like modal dialogs that is, don't let clicks and keys propagate to parent screens --- library/lua/gui/buildings.lua | 1 + library/lua/gui/dialogs.lua | 9 ++++++--- library/lua/gui/materials.lua | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/library/lua/gui/buildings.lua b/library/lua/gui/buildings.lua index 433afb1ba..93b0e2182 100644 --- a/library/lua/gui/buildings.lua +++ b/library/lua/gui/buildings.lua @@ -268,6 +268,7 @@ function BuildingDialog:onInput(keys) return true end self:inputToSubviews(keys) + return true end function showBuildingPrompt(title, prompt, on_select, on_cancel, build_filter) diff --git a/library/lua/gui/dialogs.lua b/library/lua/gui/dialogs.lua index 7a0f86b3f..63f9990c1 100644 --- a/library/lua/gui/dialogs.lua +++ b/library/lua/gui/dialogs.lua @@ -66,7 +66,8 @@ function MessageBox:onInput(keys) end return true end - return self:inputToSubviews(keys) + self:inputToSubviews(keys) + return true end function showMessage(title, text, tcolor, on_close) @@ -135,7 +136,8 @@ function InputBox:onInput(keys) end return true end - return self:inputToSubviews(keys) + self:inputToSubviews(keys) + return true end function showInputPrompt(title, text, tcolor, input, on_input, on_cancel, min_width) @@ -236,7 +238,8 @@ function ListBox:onInput(keys) end return true end - return self:inputToSubviews(keys) + self:inputToSubviews(keys) + return true end function showListPrompt(title, text, tcolor, choices, on_select, on_cancel, min_width, filter) diff --git a/library/lua/gui/materials.lua b/library/lua/gui/materials.lua index aa070ea73..112d8f6df 100644 --- a/library/lua/gui/materials.lua +++ b/library/lua/gui/materials.lua @@ -265,7 +265,8 @@ function MaterialDialog:onInput(keys) end return true end - return self:inputToSubviews(keys) + self:inputToSubviews(keys) + return true end function showMaterialPrompt(title, prompt, on_select, on_cancel, mat_filter)