Added sidebar context menu items; cursor setting

4 files changed, 27 insertions, 14 deletions

diff --git a/src/app.c b/src/app.c
index dadc8efb..d415a488 100644
--- a/src/app.c
+++ b/src/app.c
@@ -593,6 +593,7 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
             /* The input seems fine. */
             newIdentity_GmCerts(d->certs, isTemp ? temporary_GmIdentityFlag : 0,
                                 until, commonName, userId, organization, country);
+            postCommandf_App("sidebar.mode arg:%d show:1", identities_SidebarMode);
             postCommand_App("idents.changed");
         }
         destroy_Widget(dlg);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 8f31c690..8885bb9b 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -340,11 +340,12 @@ static int scrollMax_DocumentWidget_(const iDocumentWidget *d) {
 }
 
 static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse) {
-    const iRect docBounds      = documentBounds_DocumentWidget_(d);
-    const iGmRun *oldHoverLink = d->hoverLink;
-    d->hoverLink               = NULL;
-    const iInt2 hoverPos = addY_I2(sub_I2(mouse, topLeft_Rect(docBounds)), d->scrollY);
-    if (!d->noHoverWhileScrolling &&
+    const iWidget *w            = constAs_Widget(d);
+    const iRect    docBounds    = documentBounds_DocumentWidget_(d);
+    const iGmRun * oldHoverLink = d->hoverLink;
+    d->hoverLink                = NULL;
+    const iInt2 hoverPos        = addY_I2(sub_I2(mouse, topLeft_Rect(docBounds)), d->scrollY);
+    if (isHover_Widget(w) && !d->noHoverWhileScrolling &&
         (d->state == ready_RequestState || d->state == receivedPartialResponse_RequestState)) {
         iConstForEach(PtrArray, i, &d->visibleLinks) {
             const iGmRun *run = i.ptr;
@@ -357,11 +358,7 @@ static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse) {
     if (d->hoverLink != oldHoverLink) {
         refresh_Widget(as_Widget(d));
     }
-    if (!contains_Widget(constAs_Widget(d), mouse) ||
-        contains_Widget(constAs_Widget(d->scroll), mouse)) {
-//        setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW);
-    }
-    else {
+    if (isHover_Widget(w) && !contains_Widget(constAs_Widget(d->scroll), mouse)) {
         setCursor_Window(get_Window(),
                          d->hoverLink ? SDL_SYSTEM_CURSOR_HAND : SDL_SYSTEM_CURSOR_IBEAM);
     }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index fed08f52..73bd1646 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -242,6 +242,19 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
             }
             /* menu: set icon, edit notes, view urls, reveal files, delete, activate on this page,
              * deactivate on this page, deactivate everywhere  */
+            const iMenuItem menuItems[] = {
+                { "Use on This Page", 0, 0, "ident.use arg:1" },
+                { "Stop Using This Page", 0, 0, "ident.use arg:0" },
+                { "Stop Using Everywhere", 0, 0, "ident.use arg:0 clear:1" },
+                { "View Use URLs", 0, 0, "ident.showuse" },
+                { "---", 0, 0, NULL },
+                { "Edit Notes...", 0, 0, "ident.edit" },
+                { "Pick Icon...", 0, 0, "ident.pickicon" },
+                { "---", 0, 0, NULL },
+                { "Reveal Files", 0, 0, "ident.reveal" },
+                { uiTextCaution_ColorEscape "Delete Identity...", 0, 0, "ident.delete confirm:1" },
+            };
+            d->menu = makeMenu_Widget(as_Widget(d), menuItems, iElemCount(menuItems));
             break;
         }
         default:
diff --git a/src/ui/window.c b/src/ui/window.c
index 6291519a..82109c07 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -319,10 +319,12 @@ static void setupUserInterface_Window(iWindow *d) {
         setId_Widget(as_Widget(url), "url");
         setTextCStr_InputWidget(url, "gemini://");
         addChildFlags_Widget(navBar, iClob(url), expand_WidgetFlag);
-        setId_Widget(
-            addChild_Widget(navBar, iClob(newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload"))),
-            "reload");
-        addChild_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f3e0", 0, 0, "navigate.home")));
+        setId_Widget(addChild_Widget(
+                         navBar, iClob(newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload"))),
+                     "reload");
+        addChild_Widget(navBar,
+                        iClob(newIcon_LabelWidget(
+                            "\U0001f3e0", SDLK_h, KMOD_PRIMARY | KMOD_SHIFT, "navigate.home")));
 #if !defined (iHaveNativeMenus)
         iLabelWidget *navMenu =
             makeMenuButton_LabelWidget("\U0001d362", navMenuItems, iElemCount(navMenuItems));