Allow manipulator to be invoked from main dwarf mode screen

lethosor · May 21, 2015 · 54d5ed9 · 54d5ed9
1 parent 91033b2
commit 54d5ed9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/manipulator/gui/manipulator.lua b/manipulator/gui/manipulator.lua
@@ -19,6 +19,7 @@ function manipulator:init(args)
     for i, u in pairs(args.units) do
         self.units[i + 1] = unit_wrapper(u)
     end
+    self.dismiss_parent = args.dismiss_parent
     self.unit_max = #self.units
     self.bounds = {}
     self.gframe = 0
@@ -516,6 +517,9 @@ function manipulator:onDismiss(...)
     storage.default_columns = get_column_ids(self.columns)
     storage.diff_enabled = self.diff_enabled
     self.super.onDismiss(...)
+    if self.dismiss_parent then
+        dfhack.screen.dismiss(self._native.parent)
+    end
 end
 
 function manipulator:onGetSelectedUnit()

diff --git a/manipulator/main.lua b/manipulator/main.lua
@@ -141,11 +141,22 @@ manipulator_columns.ATTRS = {
     frame_title = 'Dwarf Manipulator - Columns',
 }
 
+function mkscreen(parent, opts)
+    opts = opts or {}
+    opts.units = parent.units[parent.page]
+    opts.selected = parent.units[parent.page][parent.cursor_pos[parent.page]]
+    local scr = mgui.manipulator(opts)
+    scr:show()
+    return scr
+end
+
 function main()
     local scr = dfhack.gui.getCurViewscreen()
     if df.viewscreen_unitlistst:is_instance(scr) then
-        cur = mgui.manipulator{units = scr.units[scr.page], selected = scr.units[scr.page][scr.cursor_pos[scr.page]]}
-        cur:show()
+        cur = mkscreen(scr)
+    elseif dfhack.gui.getCurFocus() == 'dwarfmode/Default' then
+        gui.simulateInput(scr, 'D_UNITLIST')
+        cur = mkscreen(dfhack.gui.getCurViewscreen(), {dismiss_parent = true})
     else
         dfhack.printerr('Invalid context')
     end