MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3892 from myk002/myk_modal 

ensure modal dialogs behave like modal dialogs
develop
Myk 2023-10-15 23:43:00 -07:00 committed by GitHub
parent dbab35f8a6 8d4d8f227d
commit 2f37212e90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/lua/gui/buildings.lua
Unescape Escape View File

@ -268,6 +268,7 @@ function BuildingDialog:onInput(keys)
return true return true
end end
self:inputToSubviews(keys) self:inputToSubviews(keys)
return true
end end
function showBuildingPrompt(title, prompt, on_select, on_cancel, build_filter) function showBuildingPrompt(title, prompt, on_select, on_cancel, build_filter)

9
library/lua/gui/dialogs.lua
Unescape Escape View File

@ -66,7 +66,8 @@ function MessageBox:onInput(keys)
end end
return true return true
end end
return self:inputToSubviews(keys) self:inputToSubviews(keys)
return true
end end
function showMessage(title, text, tcolor, on_close) function showMessage(title, text, tcolor, on_close)
@ -135,7 +136,8 @@ function InputBox:onInput(keys)
end end
return true return true
end end
return self:inputToSubviews(keys) self:inputToSubviews(keys)
return true
end end
function showInputPrompt(title, text, tcolor, input, on_input, on_cancel, min_width) function showInputPrompt(title, text, tcolor, input, on_input, on_cancel, min_width)
@ -236,7 +238,8 @@ function ListBox:onInput(keys)
end end
return true return true
end end
return self:inputToSubviews(keys) self:inputToSubviews(keys)
return true
end end
function showListPrompt(title, text, tcolor, choices, on_select, on_cancel, min_width, filter) function showListPrompt(title, text, tcolor, choices, on_select, on_cancel, min_width, filter)

3
library/lua/gui/materials.lua
Unescape Escape View File

@ -265,7 +265,8 @@ function MaterialDialog:onInput(keys)
end end
return true return true
end end
return self:inputToSubviews(keys) self:inputToSubviews(keys)
return true
end end
function showMaterialPrompt(title, prompt, on_select, on_cancel, mat_filter) function showMaterialPrompt(title, prompt, on_select, on_cancel, mat_filter)