Toggling sidebar visibility with mode keys

3 files changed, 14 insertions, 10 deletions

diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 55538812..57562cab 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -250,8 +250,10 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
     invalidate_ListWidget(d->list);
 }
 
-void setMode_SidebarWidget(iSidebarWidget *d, enum iSidebarMode mode) {
-    if (d->mode == mode) return;
+iBool setMode_SidebarWidget(iSidebarWidget *d, enum iSidebarMode mode) {
+    if (d->mode == mode) {
+        return iFalse;
+    }
     if (d->mode >= 0 && d->mode < max_SidebarMode) {
         d->modeScroll[d->mode] = scrollPos_ListWidget(d->list); /* saved for later */
     }
@@ -266,6 +268,7 @@ void setMode_SidebarWidget(iSidebarWidget *d, enum iSidebarMode mode) {
     setItemHeight_ListWidget(d->list, heights[mode] * lineHeight_Text(uiContent_FontId));
     /* Restore previous scroll position. */
     setScrollPos_ListWidget(d->list, d->modeScroll[mode]);
+    return iTrue;
 }
 
 enum iSidebarMode mode_SidebarWidget(const iSidebarWidget *d) {
@@ -501,10 +504,11 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             return iTrue;
         }
         else if (equal_Command(cmd, "sidebar.mode")) {
-            setMode_SidebarWidget(d, arg_Command(cmd));
+            const iBool wasChanged = setMode_SidebarWidget(d, arg_Command(cmd));
             updateItems_SidebarWidget_(d);
-            if (argLabel_Command(cmd, "show") && !isVisible_Widget(w)) {
-                postCommand_App("sidebar.toggle arg:1");
+            if ((argLabel_Command(cmd, "show") && !isVisible_Widget(w)) ||
+                (argLabel_Command(cmd, "toggle") && !wasChanged)) {
+                postCommand_App("sidebar.toggle");
             }
             scrollOffset_ListWidget(d->list, 0);
             return iTrue;
diff --git a/src/ui/sidebarwidget.h b/src/ui/sidebarwidget.h
index 7ccc64dd..acb7d93a 100644
--- a/src/ui/sidebarwidget.h
+++ b/src/ui/sidebarwidget.h
@@ -35,7 +35,7 @@ enum iSidebarMode {
 iDeclareWidgetClass(SidebarWidget)
 iDeclareObjectConstruction(SidebarWidget)
 
-void                setMode_SidebarWidget   (iSidebarWidget *, enum iSidebarMode mode);
+iBool               setMode_SidebarWidget   (iSidebarWidget *, enum iSidebarMode mode);
 
 enum iSidebarMode   mode_SidebarWidget      (const iSidebarWidget *);
 int                 width_SidebarWidget     (const iSidebarWidget *);
diff --git a/src/ui/window.c b/src/ui/window.c
index 66f1c513..dabf80de 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -128,10 +128,10 @@ static const iMenuItem identityMenuItems[] = {
 };
 
 static const iMenuItem viewMenuItems[] = {
-    { "Show Bookmarks", '1', KMOD_PRIMARY, "sidebar.mode arg:0 show:1" },
-    { "Show History", '2', KMOD_PRIMARY, "sidebar.mode arg:1 show:1" },
-    { "Show Identities", '3', KMOD_PRIMARY, "sidebar.mode arg:2 show:1" },
-    { "Show Page Outline", '4', KMOD_PRIMARY, "sidebar.mode arg:3 show:1" },
+    { "Show Bookmarks", '1', KMOD_PRIMARY, "sidebar.mode arg:0 toggle:1" },
+    { "Show History", '2', KMOD_PRIMARY, "sidebar.mode arg:1 toggle:1" },
+    { "Show Identities", '3', KMOD_PRIMARY, "sidebar.mode arg:2 toggle:1" },
+    { "Show Page Outline", '4', KMOD_PRIMARY, "sidebar.mode arg:3 toggle:1" },
     { "Toggle Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
     { "---", 0, 0, NULL },
     { "Go Back", SDLK_LEFTBRACKET, KMOD_PRIMARY, "navigate.back" },