From 87c7d02e095f7f5f61a00c4eff256644f474d4bc Mon Sep 17 00:00:00 2001 From: myk002 Date: Mon, 28 Jun 2021 10:50:34 -0700 Subject: [PATCH 1/3] support view unit mode for guidm.enterSidebarMode --- library/lua/gui/dwarfmode.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/library/lua/gui/dwarfmode.lua b/library/lua/gui/dwarfmode.lua index 2c61904a6..c1d444b82 100644 --- a/library/lua/gui/dwarfmode.lua +++ b/library/lua/gui/dwarfmode.lua @@ -25,6 +25,7 @@ SIDEBAR_MODE_KEYS = { [df.ui_sidebar_mode.BuildingItems]='D_BUILDITEM', [df.ui_sidebar_mode.Stockpiles]='D_STOCKPILES', [df.ui_sidebar_mode.Zones]='D_CIVZONE', + [df.ui_sidebar_mode.ViewUnits]='D_VIEWUNIT', } -- Sends ESC keycodes until we get to dwarfmode/Default and then enters the From 4eb887079703d57493701f814a57624144ab29d8 Mon Sep 17 00:00:00 2001 From: myk002 Date: Mon, 28 Jun 2021 12:30:19 -0700 Subject: [PATCH 2/3] add unit tests --- test/library/gui/dwarfmode.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/library/gui/dwarfmode.lua b/test/library/gui/dwarfmode.lua index 3d013f940..3c2c70d79 100644 --- a/test/library/gui/dwarfmode.lua +++ b/test/library/gui/dwarfmode.lua @@ -64,4 +64,10 @@ function test.enterSidebarMode() guidm.enterSidebarMode(df.ui_sidebar_mode.Default) expect.eq(df.ui_sidebar_mode.Default, df.global.ui.main.mode) expect.eq('dwarfmode/Default', dfhack.gui.getCurFocus(true)) + + -- verify that all supported modes lead where we say they'll go + for k,v in pairs(guidm.SIDEBAR_MODE_KEYS) do + guidm.enterSidebarMode(k) + expect.eq(k, df.global.ui.main.mode) + end end From f1bcf0c7b592923d3082bac61913aba4a00862bb Mon Sep 17 00:00:00 2001 From: myk002 Date: Mon, 5 Jul 2021 16:05:12 -0700 Subject: [PATCH 3/3] make dwarfmode test not require autocorrection --- test/library/gui/dwarfmode.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/library/gui/dwarfmode.lua b/test/library/gui/dwarfmode.lua index 3c2c70d79..3312050ba 100644 --- a/test/library/gui/dwarfmode.lua +++ b/test/library/gui/dwarfmode.lua @@ -70,4 +70,6 @@ function test.enterSidebarMode() guidm.enterSidebarMode(k) expect.eq(k, df.global.ui.main.mode) end + -- end test back in default so the test harness doesn't have to autocorrect + guidm.enterSidebarMode(df.ui_sidebar_mode.Default) end