From c8e73a92164fa17597985dd4f2d63ec2d91badd8 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Mon, 16 Mar 2020 11:43:33 -0400 Subject: Use a default width for `ui.dialogs.filteredlist` dialogs. Experience has shown a vast majority of filteredlist dialogs need to be wide. Use a standard width that needs to be overridden rather than remembered. --- core/file_io.lua | 3 +-- core/ui.lua | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/file_io.lua b/core/file_io.lua index d0c0fb8f..ad9649d0 100644 --- a/core/file_io.lua +++ b/core/file_io.lua @@ -337,8 +337,7 @@ function io.open_recent_file() utf8_list[#utf8_list + 1] = io.recent_files[i]:iconv('UTF-8', _CHARSET) end local button, i = ui.dialogs.filteredlist{ - title = _L['Open File'], columns = _L['Filename'], items = utf8_list, - width = CURSES and ui.size[1] - 2 or nil + title = _L['Open File'], columns = _L['Filename'], items = utf8_list } if button == 1 and i then io.open_file(io.recent_files[i]) end end diff --git a/core/ui.lua b/core/ui.lua index aec0725f..5adbc758 100644 --- a/core/ui.lua +++ b/core/ui.lua @@ -102,6 +102,9 @@ ui.dialogs = setmetatable({}, {__index = function(_, k) -- @return Lua objects depending on the dialog kind return function(options) if not options.button1 then options.button1 = _L['OK'] end + if k == 'filteredlist' and not options.width then + options.width = ui.size[1] - 2 * (CURSES and 1 or 100) + end -- Transform key-value pairs into command line arguments. local args = {} for option, value in pairs(options) do @@ -220,8 +223,7 @@ function ui.switch_buffer(zorder) utf8_list[#utf8_list + 1] = filename end local button, i = ui.dialogs.filteredlist{ - title = _L['Switch Buffers'], columns = columns, items = utf8_list, - width = CURSES and ui.size[1] - 2 or nil + title = _L['Switch Buffers'], columns = columns, items = utf8_list } if button == 1 and i then view:goto_buffer(buffers[not zorder and i or i + 1]) -- cgit v1.2.3