2 files changed, 46 insertions, 38 deletions

diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 9946ac5a..a3ff8a3e 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -83,18 +83,18 @@ iDefineObjectConstruction(SidebarItem)
 /*----------------------------------------------------------------------------------------------*/
 
 struct Impl_SidebarWidget {
-    iWidget widget;
+    iWidget           widget;
     enum iSidebarMode mode;
-    iWidget *blank;
-    iListWidget *list;
-    int modeScroll[max_SidebarMode];
-    int width;
-    iLabelWidget *modeButtons[max_SidebarMode];
-    int maxButtonLabelWidth;
-    iWidget *resizer;
-    SDL_Cursor *resizeCursor;
-    iWidget *menu;
-    iSidebarItem *menuItem; /* list item accessed in the context menu */
+    iWidget *         blank;
+    iListWidget *     list;
+    int               modeScroll[max_SidebarMode];
+    iLabelWidget *    modeButtons[max_SidebarMode];
+    int               maxButtonLabelWidth;
+    int               width;
+    iWidget *         resizer;
+    SDL_Cursor *      resizeCursor;
+    iWidget *         menu;
+    iSidebarItem *    menuItem; /* list item accessed in the context menu */
 };
 
 iDefineObjectConstruction(SidebarWidget)
@@ -149,10 +149,6 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                 const iBookmark *bm = get_Bookmarks(bookmarks_App(), entry->bookmarkId);
                 if (bm) {
                     item->icon = bm->icon;
-//                    appendCStr_String(&item->meta, uiTextCaution_ColorEscape);
-//                    appendChar_String(&item->meta, bm->icon);
-//                    appendChar_String(&item->meta, ' ');
-//                    appendCStr_String(&item->meta, uiText_ColorEscape);
                     append_String(&item->meta, &bm->title);
                 }
                 addItem_ListWidget(d->list, item);
@@ -167,8 +163,10 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                                { "Add Bookmark...", 0, 0, "feed.entry.bookmark" },
                                { "Edit Feed...", 0, 0, "feed.entry.edit" },
                                { "---", 0, 0, NULL },
-                               { uiTextCaution_ColorEscape "Unsubscribe", 0, 0, "feed.entry.unsubscribe" } },
-                8);
+                               { uiTextCaution_ColorEscape "Unsubscribe...", 0, 0, "feed.entry.unsubscribe" },
+                               { "---", 0, 0, NULL },
+                               { "Refresh Feeds", SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh" } },
+                10);
             break;
         }
         case documentOutline_SidebarMode: {
@@ -942,6 +940,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
     }
     iInt2 pos = itemRect.pos;
     /* Selection indicator. */
+    /* TODO: Make a better-looking one. */
     if (d->listItem.isSelected && (sidebar->mode == feeds_SidebarMode ||
                                    sidebar->mode == identities_SidebarMode)) {
         drawRectThickness_Paint(p,
@@ -962,7 +961,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
         const int fg = isHover ? (isPressing ? uiTextPressed_ColorId : uiTextFramelessHover_ColorId)
                                : uiText_ColorId;
         if (d->listItem.isSeparator) {
-            if (itemRect.pos.y > 0) {
+            if (d != constItem_ListWidget(list, 0)) {
                 drawHLine_Paint(p,
                                 addY_I2(pos, 2 * gap_UI),
                                 width_Rect(itemRect) - scrollBarWidth,
@@ -995,7 +994,9 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                 drawCentered_Text(uiContent_FontId,
                                   adjusted_Rect(iconArea, init_I2(gap_UI, 0), zero_I2()),
                                   iTrue,
-                                  isHover && isPressing ? iconColor : uiTextCaution_ColorId,
+                                  isHover && isPressing
+                                      ? iconColor
+                                      : (isUnread ? uiTextCaution_ColorId : iconColor),
                                   "%s",
                                   cstr_String(&str));
                 deinit_String(&str);
diff --git a/src/ui/window.c b/src/ui/window.c
index b31707fe..6e046bdc 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -97,7 +97,7 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
 
 #if !defined (iHaveNativeMenus)
 /* TODO: Submenus wouldn't hurt here. */
-static const iMenuItem navMenuItems[] = {
+static const iMenuItem navMenuItems_[] = {
     { "New Tab", 't', KMOD_PRIMARY, "tabs.new" },
     { "Open Location...", SDLK_l, KMOD_PRIMARY, "navigate.focus" },
     { "---", 0, 0, NULL },
@@ -121,27 +121,21 @@ static const iMenuItem navMenuItems[] = {
 
 #if defined (iHaveNativeMenus)
 /* Using native menus. */
-static const iMenuItem fileMenuItems[] = {
+static const iMenuItem fileMenuItems_[] = {
     { "New Tab", SDLK_t, KMOD_PRIMARY, "tabs.new" },
     { "Open Location...", SDLK_l, KMOD_PRIMARY, "navigate.focus" },
     { "---", 0, 0, NULL },
     { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
 };
 
-static const iMenuItem editMenuItems[] = {
+static const iMenuItem editMenuItems_[] = {
     { "Copy", SDLK_c, KMOD_PRIMARY, "copy" },
     { "Copy Link to Page", SDLK_c, KMOD_PRIMARY | KMOD_SHIFT, "document.copylink" },
     { "---", 0, 0, NULL },
     { "Find", SDLK_f, KMOD_PRIMARY, "focus.set id:find.input" },
-    { "---", 0, 0, NULL },
-    { "Bookmark This Page...", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
 };
 
-static const iMenuItem identityMenuItems[] = {
-    { "New Identity...", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" },
-};
-
-static const iMenuItem viewMenuItems[] = {
+static const iMenuItem viewMenuItems_[] = {
     { "Show Bookmarks", '1', KMOD_PRIMARY, "sidebar.mode arg:0 toggle:1" },
     { "Show Feeds", '2', KMOD_PRIMARY, "sidebar.mode arg:1 toggle:1" },
     { "Show History", '3', KMOD_PRIMARY, "sidebar.mode arg:2 toggle:1" },
@@ -162,13 +156,25 @@ static const iMenuItem viewMenuItems[] = {
     { "Wrap Preformatted", 0, 0, "forcewrap.toggle" }
 };
 
-static const iMenuItem helpMenuItems[] = {
+static iMenuItem bookmarksMenuItems_[] = {
+    { "Bookmark This Page...", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
+    { "---", 0, 0, NULL },
+    { "Subscribe as Feed", 0, 0, "bookmark.addtag tag:subscribed" },
+    { "---", 0, 0, NULL },
+    { "Refresh Feeds", SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh" },
+};
+
+static const iMenuItem identityMenuItems_[] = {
+    { "New Identity...", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" },
+};
+
+static const iMenuItem helpMenuItems_[] = {
     { "Help", 0, 0, "!open url:about:help" },
     { "Release Notes", 0, 0, "!open url:about:version" },
 };
 #endif
 
-static const iMenuItem identityButtonMenuItems[] = {
+static const iMenuItem identityButtonMenuItems_[] = {
     { "No Active Identity", 0, 0, "ident.showactive" },
     { "---", 0, 0, NULL },
 #if !defined (iHaveNativeMenus)
@@ -377,7 +383,7 @@ static void setupUserInterface_Window(iWindow *d) {
         addChild_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f870", 0, 0, "navigate.back")));
         addChild_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f872", 0, 0, "navigate.forward")));
         iLabelWidget *idMenu = makeMenuButton_LabelWidget(
-            "\U0001f464", identityButtonMenuItems, iElemCount(identityButtonMenuItems));
+            "\U0001f464", identityButtonMenuItems_, iElemCount(identityButtonMenuItems_));
         setAlignVisually_LabelWidget(idMenu, iTrue);
         addChild_Widget(navBar, iClob(idMenu));
         setId_Widget(as_Widget(idMenu), "navbar.ident");
@@ -414,15 +420,16 @@ static void setupUserInterface_Window(iWindow *d) {
                             "\U0001f3e0", SDLK_h, KMOD_PRIMARY | KMOD_SHIFT, "navigate.home")));
 #if !defined (iHaveNativeMenus)
         iLabelWidget *navMenu =
-            makeMenuButton_LabelWidget("\U0001d362", navMenuItems, iElemCount(navMenuItems));
+            makeMenuButton_LabelWidget("\U0001d362", navMenuItems_, iElemCount(navMenuItems_));
         setAlignVisually_LabelWidget(navMenu, iTrue);
         addChild_Widget(navBar, iClob(navMenu));
 #else
-        insertMenuItems_MacOS("File", 1, fileMenuItems, iElemCount(fileMenuItems));
-        insertMenuItems_MacOS("Edit", 2, editMenuItems, iElemCount(editMenuItems));
-        insertMenuItems_MacOS("View", 3, viewMenuItems, iElemCount(viewMenuItems));
-        insertMenuItems_MacOS("Identity", 4, identityMenuItems, iElemCount(identityMenuItems));
-        insertMenuItems_MacOS("Help", 6, helpMenuItems, iElemCount(helpMenuItems));
+        insertMenuItems_MacOS("File", 1, fileMenuItems_, iElemCount(fileMenuItems_));
+        insertMenuItems_MacOS("Edit", 2, editMenuItems_, iElemCount(editMenuItems_));
+        insertMenuItems_MacOS("View", 3, viewMenuItems_, iElemCount(viewMenuItems_));
+        insertMenuItems_MacOS("Bookmarks", 4, bookmarksMenuItems_, iElemCount(bookmarksMenuItems_));
+        insertMenuItems_MacOS("Identity", 5, identityMenuItems_, iElemCount(identityMenuItems_));
+        insertMenuItems_MacOS("Help", 7, helpMenuItems_, iElemCount(helpMenuItems_));
 #endif
     }
     /* Tab bar. */ {