1 files changed, 15 insertions, 11 deletions
diff --git a/tex/context/base/mkiv/scrn-but.mkvi b/tex/context/base/mkiv/scrn-but.mkvi
index 65b0d2c4e..8bbd6eeda 100644
--- a/tex/context/base/mkiv/scrn-but.mkvi
+++ b/tex/context/base/mkiv/scrn-but.mkvi
@@ -16,7 +16,7 @@
 
 \writestatus{loading}{ConTeXt Screen Macros / Buttons}
 
-\registerctxluafile{scrn-but}{1.001}
+\registerctxluafile{scrn-but}{}
 
 \unprotect
 
@@ -75,13 +75,17 @@
   {\iffirstargument
      \setupcurrentbutton[#settings]%
    \fi
-   \scrn_button_make
-     \buttonparameter
-     \inheritedbuttonframed
-     \letbuttonparameter
-     \setbuttonparameter
-     {#text}%
-     {#action}%
+   % no \dontleavehmode as it will force a vbox to \hsize which then
+   % spoils a tight box
+   \hpack\bgroup
+     \scrn_button_make
+       \buttonparameter
+       \inheritedbuttonframed
+       \letbuttonparameter
+       \setbuttonparameter
+       {#text}%
+       {#action}%
+   \egroup
    \endgroup}
 
 \def\scrn_button_direct_ignore[#settings]#text[#destination]%
@@ -550,7 +554,7 @@
    \setbox\b_scrn_menu\hbox to \d_scrn_menu_used_width
      {\ifx\currentinteractionmenustate\v!empty \else
         \interactionmenuparameter\c!left
-        \scrn_menu_package_vertical{\strictinteractionmenuparameter\c!menu}%
+        \scrn_menu_package_vertical{\directinteractionmenuparameter\c!menu}%
         \interactionmenuparameter\c!right
       \fi}%
    \edef\currentinteractionmenudistance{\interactionmenuparameter\c!distance}%
@@ -571,7 +575,7 @@
      {\ifx\currentinteractionmenustate\v!none \else
         \scrn_menu_top_align
         \interactionmenuparameter\c!before
-        \scrn_menu_package_horizontal{\strictinteractionmenuparameter\c!menu}%
+        \scrn_menu_package_horizontal{\directinteractionmenuparameter\c!menu}%
         \interactionmenuparameter\c!after
         \scrn_menu_bottom_align
       \fi}%
@@ -784,7 +788,7 @@
    \edef\currentinteractionmenu{#tag}%
    \doif{\interactionmenuparameter\c!state}\v!local
      {\letinteractionmenuparameter\c!state\v!start
-      \strictinteractionmenuparameter\c!menu}%
+      \directinteractionmenuparameter\c!menu}%
    \endgroup}
 
 %D Direct call (todo):