SidebarWidget: Identities list click behavior

Avoid accidental activations by never (de)activating identities based on a single click. Now both left and right mouse clicks will open the context menu.

3 files changed, 21 insertions, 13 deletions

diff --git a/src/ui/listwidget.c b/src/ui/listwidget.c
index a3406d48..a43b11ee 100644
--- a/src/ui/listwidget.c
+++ b/src/ui/listwidget.c
@@ -369,6 +369,13 @@ static iBool processEvent_ListWidget_(iListWidget *d, const SDL_Event *ev) {
     return processEvent_Widget(w, ev);
 }
 
+iRect itemRect_ListWidget(const iListWidget *d, size_t index) {
+    const iRect bounds  = innerBounds_Widget(constAs_Widget(d));
+    const int   scrollY = pos_SmoothScroll(&d->scrollY);
+    return (iRect){ addY_I2(topLeft_Rect(bounds), d->itemHeight * (int) index - scrollY),
+                    init_I2(width_Rect(bounds), d->itemHeight) };
+}
+
 static void draw_ListWidget_(const iListWidget *d) {
     const iWidget *w      = constAs_Widget(d);
     const iRect    bounds = innerBounds_Widget(w);
diff --git a/src/ui/listwidget.h b/src/ui/listwidget.h
index 16adf664..314c183a 100644
--- a/src/ui/listwidget.h
+++ b/src/ui/listwidget.h
@@ -73,6 +73,7 @@ iAnyObject *        hoverItem_ListWidget        (iListWidget *);
 size_t              numItems_ListWidget         (const iListWidget *);
 int                 visCount_ListWidget         (const iListWidget *);
 size_t              itemIndex_ListWidget        (const iListWidget *, iInt2 pos);
+iRect               itemRect_ListWidget         (const iListWidget *, size_t index);
 const iAnyObject *  constItem_ListWidget        (const iListWidget *, size_t index);
 const iAnyObject *  constHoverItem_ListWidget   (const iListWidget *);
 size_t              hoverItemIndex_ListWidget   (const iListWidget *);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index aa58eb45..556ae951 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -766,7 +766,7 @@ static iGmIdentity *hoverIdentity_SidebarWidget_(const iSidebarWidget *d) {
     return iConstCast(iGmIdentity *, constHoverIdentity_SidebarWidget_(d));
 }
 
-static void itemClicked_SidebarWidget_(iSidebarWidget *d, const iSidebarItem *item) {
+static void itemClicked_SidebarWidget_(iSidebarWidget *d, iSidebarItem *item, size_t itemIndex) {
     setFocus_Widget(NULL);
     switch (d->mode) {
         case documentOutline_SidebarMode: {
@@ -791,17 +791,16 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, const iSidebarItem *it
             break;
         }
         case identities_SidebarMode: {
-            iGmIdentity *ident = hoverIdentity_SidebarWidget_(d);
-            if (ident) {
-                const iString *tabUrl = url_DocumentWidget(document_App());
-                if (isUsedOn_GmIdentity(ident, tabUrl)) {
-                    signOut_GmCerts(certs_App(), tabUrl);
-                }
-                else {
-                    signIn_GmCerts(certs_App(), ident, tabUrl);
-                }
-                updateItems_SidebarWidget_(d);
-                updateMouseHover_ListWidget(d->list);
+            d->contextItem  = item;
+            d->contextIndex = itemIndex;
+            if (itemIndex < numItems_ListWidget(d->list)) {
+                updateContextMenu_SidebarWidget_(d);
+                arrange_Widget(d->menu);
+                openMenu_Widget(d->menu,
+                                d->side == left_SideBarSide
+                                    ? topRight_Rect(itemRect_ListWidget(d->list, itemIndex))
+                                    : addX_I2(topLeft_Rect(itemRect_ListWidget(d->list, itemIndex)),
+                                              -width_Widget(d->menu)));
             }
             break;
         }
@@ -1065,7 +1064,8 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             return iTrue;
         }
         else if (isCommand_Widget(w, ev, "list.clicked")) {
-            itemClicked_SidebarWidget_(d, pointerLabel_Command(cmd, "item"));
+            itemClicked_SidebarWidget_(
+                d, pointerLabel_Command(cmd, "item"), argU32Label_Command(cmd, "arg"));
             return iTrue;
         }
         else if (isCommand_Widget(w, ev, "menu.closed")) {