Merge remote-tracking branch 'origin' into HEAD

Author: ChrisJohnsen

changelog.txt

@@ -35,6 +35,7 @@ Template for new versions:
 
 ## Fixes
 - `idle-crafting`: check that units still have crafting needs before creating a job for them
+- `gui/journal`: prevent pause/unpause events from leaking through the UI when keys are mashed
 
 ## Misc Improvements
 

gui/journal.lua

@@ -268,6 +268,7 @@ end
 JournalScreen = defclass(JournalScreen, gui.ZScreen)
 JournalScreen.ATTRS {
     focus_path='journal',
+    pass_pause=false,
     context_mode=DEFAULT_NIL,
     save_layout=true,
     save_prefix=''

gui/sitemap.lua

@@ -368,7 +368,7 @@ end
 SitemapToolbarOverlay = defclass(SitemapToolbarOverlay, overlay.OverlayWidget)
 SitemapToolbarOverlay.ATTRS{
     desc='Adds a button to the toolbar at the bottom left corner of the screen for launching gui/sitemap.',
-    default_pos={x=35, y=-1},
+    default_pos={x=34, y=-1},
     default_enabled=true,
     viewscreens='dwarfmode',
     frame={w=28, h=10},
@@ -392,7 +392,7 @@ function SitemapToolbarOverlay:init()
                 widgets.Label{
                     text={
                         'Open the general search', NEWLINE,
-                        'interface.', NEWLINE,
+                        'and zoom interface.', NEWLINE,
                         NEWLINE,
                         {text='Hotkey: ', pen=COLOR_GRAY}, {key='CUSTOM_CTRL_G'},
                     },