3 files changed, 60 insertions, 11 deletions

diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 7729ccca..7d0e8b42 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -76,8 +76,12 @@ static void clearItems_SidebarWidget_(iSidebarWidget *d) {
 
 static iRect contentBounds_SidebarWidget_(const iSidebarWidget *d) {
     iRect bounds = bounds_Widget(constAs_Widget(d));
-    adjustEdges_Rect(&bounds, as_Widget(d->modeButtons[0])->rect.size.y + gap_UI,
-                     -constAs_Widget(d->scroll)->rect.size.x, -gap_UI, 0);
+    const iWidget *scroll = constAs_Widget(d->scroll);
+    adjustEdges_Rect(&bounds,
+                     as_Widget(d->modeButtons[0])->rect.size.y + gap_UI,
+                     isVisible_Widget(scroll) ? -scroll->rect.size.x : 0,
+                     -gap_UI,
+                     0);
     return bounds;
 }
 
@@ -318,6 +322,15 @@ void setWidth_SidebarWidget(iSidebarWidget *d, int width) {
 iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *cmd) {
     iSidebarWidget *d = findWidget_App("sidebar");
     if (equal_Command(cmd, "bmed.accept") || equal_Command(cmd, "cancel")) {
+        if (equal_Command(cmd, "bmed.accept")) {
+            const iSidebarItem *item = hoverItem_SidebarWidget_(d);
+            iAssert(item); /* hover item cannot have been changed */
+            iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
+            set_String(&bm->title, text_InputWidget(findChild_Widget(editor, "bmed.title")));
+            set_String(&bm->url, text_InputWidget(findChild_Widget(editor, "bmed.url")));
+            set_String(&bm->tags, text_InputWidget(findChild_Widget(editor, "bmed.tags")));
+            postCommand_App("bookmarks.changed");
+        }
         setFlags_Widget(as_Widget(d), disabled_WidgetFlag, iFalse);
         destroy_Widget(editor);
         return iTrue;
@@ -402,9 +415,10 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             if (d->mode == bookmarks_SidebarMode && item) {
                 setFlags_Widget(w, disabled_WidgetFlag, iTrue);
                 iWidget *dlg = makeBookmarkEditor_Widget();
-                setText_InputWidget(findChild_Widget(dlg, "bmed.title"), &item->label);
-                setText_InputWidget(findChild_Widget(dlg, "bmed.url"), &item->url);
-                //setText_InputWidget(findChild_Widget(dlg, "bmed.tags"), &item->)
+                iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
+                setText_InputWidget(findChild_Widget(dlg, "bmed.title"), &bm->title);
+                setText_InputWidget(findChild_Widget(dlg, "bmed.url"), &bm->url);
+                setText_InputWidget(findChild_Widget(dlg, "bmed.tags"), &bm->tags);
                 setCommandHandler_Widget(dlg, handleBookmarkEditorCommands_SidebarWidget_);
             }
             return iTrue;
diff --git a/src/ui/util.c b/src/ui/util.c
index 185d37f3..05b3c930 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -168,8 +168,9 @@ iWidget *makeMenu_Widget(iWidget *parent, const iMenuItem *items, size_t n) {
     setFrameColor_Widget(menu, black_ColorId);
     setBackgroundColor_Widget(menu, gray25_ColorId);
     setFlags_Widget(menu,
-                    keepOnTop_WidgetFlag | hidden_WidgetFlag | arrangeVertical_WidgetFlag |
-                        arrangeSize_WidgetFlag | resizeChildrenToWidestChild_WidgetFlag,
+                    keepOnTop_WidgetFlag | collapse_WidgetFlag | hidden_WidgetFlag |
+                        arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag |
+                        resizeChildrenToWidestChild_WidgetFlag,
                     iTrue);
     for (size_t i = 0; i < n; ++i) {
         const iMenuItem *item = &items[i];
@@ -659,10 +660,8 @@ iWidget *makeQuestion_Widget(const char *title,
 
 void setToggle_Widget(iWidget *d, iBool active) {
     setFlags_Widget(d, selected_WidgetFlag, active);
-    updateText_LabelWidget(
-        (iLabelWidget *) d,
-        collectNewFormat_String(
-            "%s", isSelected_Widget(d) ? "YES" : "NO"));
+    updateText_LabelWidget((iLabelWidget *) d,
+                           collectNewFormat_String("%s", isSelected_Widget(d) ? "YES" : "NO"));
 }
 
 static iBool toggleHandler_(iWidget *d, const char *cmd) {
@@ -709,3 +708,38 @@ iWidget *makePreferences_Widget(void) {
     centerSheet_Widget(dlg);
     return dlg;
 }
+
+iWidget *makeBookmarkEditor_Widget(void) {
+    iWidget *dlg = makeSheet_Widget("bmed");
+    addChild_Widget(dlg, iClob(new_LabelWidget(cyan_ColorEscape "EDIT BOOKMARK", 0, 0, NULL)));
+    iWidget *page = new_Widget();
+    addChild_Widget(dlg, iClob(page));
+    setFlags_Widget(page, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
+    iWidget *headings = addChildFlags_Widget(
+        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
+    iWidget *values = addChildFlags_Widget(
+        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
+    iInputWidget *inputs[4];
+    addChild_Widget(headings, iClob(makeHeading_Widget("Title:")));
+    setId_Widget(addChild_Widget(values, iClob(inputs[0] = new_InputWidget(0))), "bmed.title");
+    addChild_Widget(headings, iClob(makeHeading_Widget("URL:")));
+    setId_Widget(addChild_Widget(values, iClob(inputs[1] = new_InputWidget(0))), "bmed.url");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Tags:")));
+    setId_Widget(addChild_Widget(values, iClob(inputs[2] = new_InputWidget(0))), "bmed.tags");
+    arrange_Widget(dlg);
+    for (int i = 0; i < 3; ++i) {
+        as_Widget(inputs[i])->rect.size.x = dlg->rect.size.x - headings->rect.size.x - 3 * gap_UI;
+    }
+    iWidget *div = new_Widget(); {
+        setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
+        addChild_Widget(div, iClob(new_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
+        addChild_Widget(
+            div,
+            iClob(new_LabelWidget(
+                orange_ColorEscape "Save", SDLK_RETURN, KMOD_PRIMARY, "bmed.accept")));
+    }
+    addChild_Widget(dlg, iClob(div));
+    addChild_Widget(get_Window()->root, iClob(dlg));
+    centerSheet_Widget(dlg);
+    return dlg;
+}
diff --git a/src/ui/util.h b/src/ui/util.h
index b67f0a87..6595b94c 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -121,3 +121,4 @@ void        makeMessage_Widget      (const char *title, const char *msg);
 iWidget *   makeQuestion_Widget     (const char *title, const char *msg,
                                      const char *labels[], const char *commands[], size_t count);
 iWidget *   makePreferences_Widget  (void);
+iWidget *   makeBookmarkEditor_Widget(void);