From b787c2bb1e857727a98af1edad6aada26bb48fc1 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sat, 12 Aug 2023 22:02:17 -0700 Subject: [PATCH 1/2] make creating a workorder a subscreen instead of a top-level --- library/modules/Gui.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index a8941fee7..acd8d0107 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -215,6 +215,8 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode) case df::enums::info_interface_mode_type::WORK_ORDERS: if (game->main_interface.info.work_orders.conditions.open) newFocusString += "/Conditions"; + else if (game->main_interface.create_work_order.open) + newFocusString += "/Create"; else newFocusString += "/Default"; break; @@ -481,11 +483,6 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode) newFocusString += "/AssignUniform"; focusStrings.push_back(newFocusString); } - if (game->main_interface.create_work_order.open) { - newFocusString = baseFocus; - newFocusString += "/CreateWorkOrder"; - focusStrings.push_back(newFocusString); - } if (game->main_interface.hotkey.open) { newFocusString = baseFocus; newFocusString += "/Hotkey"; From 35b0765f58e83051a3e39e1735ecc38ec692054a Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sat, 12 Aug 2023 22:06:52 -0700 Subject: [PATCH 2/2] update changelog --- docs/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.txt b/docs/changelog.txt index 749b00c93..6db94a14c 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -61,6 +61,7 @@ Template for new versions: ## Fixes - Core: properly reload scripts in mods when a world is unloaded and immediately loaded again - Core: fix text getting added to DFHack text entry widgets when Alt- or Ctrl- keys are hit +- `orders`: prevent import/export overlay from appearing on the create workorder screen ## Misc Improvements - Surround DFHack-specific UI elements with square brackets instead of red-yellow blocks for better readability