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

Merge pull request #3672 from myk002/myk_gui 

[orders] prevent overlay from appearing on the new workorder page
develop
Myk 2023-08-12 23:21:13 -07:00 committed by GitHub
parent e69b6ed4ea 35b0765f58
commit 71e5901214
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -61,6 +61,7 @@ Template for new versions:
## Fixes ## Fixes
- Core: properly reload scripts in mods when a world is unloaded and immediately loaded again - 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 - 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 ## Misc Improvements
- Surround DFHack-specific UI elements with square brackets instead of red-yellow blocks for better readability - Surround DFHack-specific UI elements with square brackets instead of red-yellow blocks for better readability

7
library/modules/Gui.cpp
Unescape Escape View File

@ -215,6 +215,8 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode)
case df::enums::info_interface_mode_type::WORK_ORDERS: case df::enums::info_interface_mode_type::WORK_ORDERS:
if (game->main_interface.info.work_orders.conditions.open) if (game->main_interface.info.work_orders.conditions.open)
newFocusString += "/Conditions"; newFocusString += "/Conditions";
else if (game->main_interface.create_work_order.open)
newFocusString += "/Create";
else else
newFocusString += "/Default"; newFocusString += "/Default";
break; break;
@ -481,11 +483,6 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode)
newFocusString += "/AssignUniform"; newFocusString += "/AssignUniform";
focusStrings.push_back(newFocusString); 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) { if (game->main_interface.hotkey.open) {
newFocusString = baseFocus; newFocusString = baseFocus;
newFocusString += "/Hotkey"; newFocusString += "/Hotkey";