6 files changed, 34 insertions, 13 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 874a117e..007311d2 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -537,7 +537,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             }
         }
         /* Folded blocks are represented by a single run with the alt text. */
-        if (isPreformat) {
+        if (isPreformat && d->format != plainText_GmDocumentFormat) {
             const iGmPreMeta *meta = constAt_Array(&d->preMeta, preId - 1);
             if (meta->flags & folded_GmPreMetaFlag) {
                 const iBool isBlank = isEmpty_Range(&meta->altText);
@@ -669,7 +669,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                        type == quote_GmLineType ? 4 : 0);
         const iBool isWordWrapped =
             (d->format == plainText_GmDocumentFormat ? prefs->plainTextWrap : !isPreformat);
-        if (isPreformat) {
+        if (isPreformat && d->format != plainText_GmDocumentFormat) {
             /* Remember the top left coordinates of the block (first line of block). */
             iGmPreMeta *meta = at_Array(&d->preMeta, preId - 1);
             if (~meta->flags & topLeft_GmPreMetaFlag) {
diff --git a/src/macos.m b/src/macos.m
index 0dcc3ef5..61507b6f 100644
--- a/src/macos.m
+++ b/src/macos.m
@@ -497,7 +497,7 @@ void insertMenuItems_MacOS(const char *menuLabel, int atIndex, const iMenuItem *
                 [myDel setCommand:[NSString stringWithUTF8String:items[i].command] forMenuItem:item];
                 /* Bindings may have a different key. */
                 const iBinding *bind = findCommand_Keys(items[i].command);
-                if (bind) {
+                if (bind && bind->id < builtIn_BindingId) {
                     key   = bind->key;
                     kmods = bind->mods;
                 }
@@ -533,7 +533,7 @@ void handleCommand_MacOS(const char *cmd) {
                     if (command) {
                         const iBinding *bind = findCommand_Keys(
                             [command cStringUsingEncoding:NSUTF8StringEncoding]);
-                        if (bind) {
+                        if (bind && bind->id < builtIn_BindingId) {
                             setShortcut_NSMenuItem_(menuItem, bind->key, bind->mods);
                         }
                     }
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 891d8588..d338cf04 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -562,7 +562,8 @@ static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse) {
         animate_DocumentWidget_(d);
         refresh_Widget(w);
     }
-    else if (d->hoverPre && targetValue_Anim(&d->altTextOpacity) < 0.5f) {
+    else if (d->hoverPre && targetValue_Anim(&d->altTextOpacity) < 0.5f &&
+             ~d->flags & noHoverWhileScrolling_DocumentWidgetFlag) {
         setValue_Anim(&d->altTextOpacity, 1.0f, 0);
         refresh_Widget(w);
     }
@@ -3477,7 +3478,7 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
         const iGmPreMeta *meta = preMeta_GmDocument(d->doc, d->hoverAltPre->preId);
         if (meta->flags & topLeft_GmPreMetaFlag && ~meta->flags & decoration_GmRunFlag &&
             !isEmpty_Range(&meta->altText)) {
-            const int   margin   = 2 * gap_UI;
+            const int   margin   = 3 * gap_UI / 2;
             const int   altFont  = uiLabel_FontId;
             const int   wrap     = docBounds.size.x - 2 * margin;
             iInt2 pos            = addY_I2(add_I2(docBounds.pos, meta->pixelRect.pos),
diff --git a/src/ui/keys.h b/src/ui/keys.h
index 90e33b7c..4cbca3b7 100644
--- a/src/ui/keys.h
+++ b/src/ui/keys.h
@@ -56,6 +56,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #   define subscribeToPage_KeyModifier  SDLK_d,             KMOD_SHIFT | KMOD_PRIMARY
 #endif
 
+#define builtIn_BindingId   1000    /* not user-configurable */
+
 iDeclareType(Binding)
 
 struct Impl_Binding {
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 1805525c..d16ef69d 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -172,6 +172,10 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
             *frame2 = uiEmbossSelected2_ColorId;
         }
     }
+    int colorEscape = none_ColorId;
+    if (startsWith_String(&d->label, "\r")) {
+        colorEscape = cstr_String(&d->label)[1] - asciiBase_ColorEscape; /* TODO: can be two bytes long */
+    }
     if (isHover_Widget(w)) {
         if (isFrameless) {
             *bg = uiBackgroundFramelessHover_ColorId;
@@ -179,14 +183,14 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
         }
         else {
             /* Frames matching color escaped text. */
-            if (startsWith_String(&d->label, "\r")) {
+            if (colorEscape != none_ColorId) {
                 if (isDark_ColorTheme(colorTheme_App())) {
-                    *frame1 = cstr_String(&d->label)[1] - asciiBase_ColorEscape;
+                    *frame1 = colorEscape;
                     *frame2 = darker_Color(*frame1);
                 }
                 else {
-                    *bg = *frame1 = *frame2 = cstr_String(&d->label)[1] - asciiBase_ColorEscape;
-                    *fg = uiBackground_ColorId | permanent_ColorId;
+                    *bg = *frame1 = *frame2 = colorEscape;
+                    *fg = uiText_ColorId | permanent_ColorId;
                 }
             }
             else if (isSel) {
@@ -204,9 +208,14 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
         *bg = uiBackgroundPressed_ColorId | permanent_ColorId;
         if (isButton) {
             *frame1 = uiEmbossPressed1_ColorId;
-            *frame2 = uiEmbossPressed2_ColorId;
+            *frame2 = colorEscape != none_ColorId ? colorEscape : uiEmbossPressed2_ColorId;
+        }
+        if (colorEscape == none_ColorId || colorEscape == uiTextAction_ColorId) {
+            *fg = uiTextPressed_ColorId | permanent_ColorId;
+        }
+        else {
+            *fg = isDark_ColorTheme(colorTheme_App()) ? white_ColorId : black_ColorId;
         }
-        *fg = uiTextPressed_ColorId | permanent_ColorId;
     }
     if (d->forceFg >= 0) {
         *fg = d->forceFg;
@@ -288,7 +297,9 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
                            add_I2(topRight_Rect(bounds),
                                   addX_I2(negX_I2(padding_(flags)),
                                           deviceType_App() == tablet_AppDeviceType ? gap_UI : 0)),
-                           flags & pressed_WidgetFlag ? fg : uiTextShortcut_ColorId,
+                           flags & pressed_WidgetFlag ? fg
+                           : isCaution                ? uiTextCaution_ColorId
+                                                      : uiTextShortcut_ColorId,
                            right_Alignment,
                            cstr_String(&str));
             deinit_String(&str);
diff --git a/src/ui/util.c b/src/ui/util.c
index 19fba3a4..08a04105 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -96,6 +96,9 @@ void toString_Sym(int key, int kmods, iString *str) {
     if (key == 0x20) {
         appendCStr_String(str, "Space");
     }
+    else if (key == SDLK_ESCAPE) {
+        appendCStr_String(str, "Esc");
+    }
     else if (key == SDLK_LEFT) {
         appendChar_String(str, 0x2190);
     }
@@ -117,6 +120,9 @@ void toString_Sym(int key, int kmods, iString *str) {
     else if (key == SDLK_DELETE) {
         appendChar_String(str, 0x2326); /* Erase to the Right */
     }
+    else if (key == SDLK_RETURN) {
+        appendChar_String(str, 0x21a9); /* Leftwards arrow with a hook */
+    }
     else {
         appendCStr_String(str, SDL_GetKeyName(key));
     }
@@ -1631,6 +1637,7 @@ iWidget *makeDialogButtons_Widget(const iMenuItem *actions, size_t numActions) {
         }
         iLabelWidget *button =
             addChild_Widget(div, iClob(newKeyMods_LabelWidget(label, key, kmods, cmd)));
+        setFlags_Widget(as_Widget(button), alignLeft_WidgetFlag | drawKey_WidgetFlag, isDefault);
         setFont_LabelWidget(button, isDefault ? fonts[1] : fonts[0]);
     }
     return div;