Editing bookmark icons

IssueID #140

3 files changed, 15 insertions, 4 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 69461901..2e81838f 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -670,9 +670,10 @@ static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
         const iChar siteIcon = siteIcon_GmDocument(d->doc);
         if (siteIcon) {
             if (!isEmpty_String(text)) {
-                prependCStr_String(text, "  ");
+                prependCStr_String(text, "  " restore_ColorEscape);
             }
             prependChar_String(text, siteIcon);
+            prependCStr_String(text, escape_Color(uiIcon_ColorId));
         }
         const int width = advanceRange_Text(default_FontId, range_String(text)).x;
         if (width <= avail ||
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index e51ec64b..25c3e145 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -346,10 +346,13 @@ static void insertChar_InputWidget_(iInputWidget *d, iChar chr) {
             resize_Array(&d->text, d->cursor + 1);
         }
         set_Array(&d->text, d->cursor++, &chr);
-        if (d->maxLen && d->cursor == d->maxLen) {
+        if (d->maxLen > 1 && d->cursor == d->maxLen) {
             iWidget *nextFocus = findFocusable_Widget(w, forward_WidgetFocusDir);
             setFocus_Widget(nextFocus == w ? NULL : nextFocus);
         }
+        else if (d->maxLen == 1) {
+            d->cursor = 0;
+        }
     }
     showCursor_InputWidget_(d);
     refresh_Widget(as_Widget(d));
@@ -675,6 +678,11 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                     remove_Array(&d->text, --d->cursor);
                     contentsWereChanged_InputWidget_(d);
                 }
+                else if (d->cursor == 0 && d->maxLen == 1) {
+                    pushUndo_InputWidget_(d);
+                    clear_Array(&d->text);
+                    contentsWereChanged_InputWidget_(d);
+                }
                 showCursor_InputWidget_(d);
                 refresh_Widget(w);
                 return iTrue;
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 36aa1235..54812aec 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -689,8 +689,10 @@ iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *c
                 removeTag_Bookmark(bm, "usericon");
                 bm->icon = 0;
             }
-            else if (!hasTag_Bookmark(bm, "usericon")) {
-                addTag_Bookmark(bm, "usericon");
+            else {
+                if (!hasTag_Bookmark(bm, "usericon")) {
+                    addTag_Bookmark(bm, "usericon");
+                }
                 bm->icon = first_String(icon);
             }
             postCommand_App("bookmarks.changed");