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

Merge pull request #3762 from myk002/myk_gui 

[Gui] differentiate the new region loading screen in the focus string
develop
Myk 2023-09-10 16:41:59 -07:00 committed by GitHub
parent 45f58aa512 e325f3b6d9
commit 4ac0be0fbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -59,6 +59,7 @@ Template for new versions:
## Fixes ## Fixes
- `buildingplan`: make the construction dimensions readout visible again - `buildingplan`: make the construction dimensions readout visible again
- `seedwatch`: fix a crash when reading data saved by very very old versions of the plugin - `seedwatch`: fix a crash when reading data saved by very very old versions of the plugin
- `gui/mod-manager`: don't continue to display overlay after the raws loading progress bar appears
## Misc Improvements ## Misc Improvements
- `sort`: sort by need for training on squad assignment screen - `sort`: sort by need for training on squad assignment screen

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

@ -161,7 +161,9 @@ DEFINE_GET_FOCUS_STRING_HANDLER(title)
DEFINE_GET_FOCUS_STRING_HANDLER(new_region) DEFINE_GET_FOCUS_STRING_HANDLER(new_region)
{ {
if (screen->doing_mods) if (screen->raw_load)
focusStrings.push_back(baseFocus + "/Loading");
else if (screen->doing_mods)
focusStrings.push_back(baseFocus + "/Mods"); focusStrings.push_back(baseFocus + "/Mods");
else if (screen->doing_simple_params) else if (screen->doing_simple_params)
focusStrings.push_back(baseFocus + "/Basic"); focusStrings.push_back(baseFocus + "/Basic");