Save identity usage changes immediately

4 files changed, 11 insertions, 4 deletions

diff --git a/src/app.c b/src/app.c
index 25b068a5..3b62cd87 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1921,6 +1921,10 @@ iBool handleCommand_App(const char *cmd) {
         postCommand_App("idents.changed");
         return iTrue;
     }
+    else if (equal_Command(cmd, "idents.changed")) {
+        saveIdentities_GmCerts(d->certs);
+        return iFalse;
+    }
     else if (equal_Command(cmd, "os.theme.changed")) {
         if (d->prefs.useSystemTheme) {
             const int dark     = argLabel_Command(cmd, "dark");
diff --git a/src/gmcerts.c b/src/gmcerts.c
index 3e629f8f..8c011137 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -200,7 +200,7 @@ static const char *magicIdentity_GmCerts_ = "iden";
 
 iDefineTypeConstructionArgs(GmCerts, (const char *saveDir), saveDir)
 
-static void saveIdentities_GmCerts_(const iGmCerts *d) {
+void saveIdentities_GmCerts(const iGmCerts *d) {
     iFile *f = new_File(collect_String(concatCStr_Path(&d->saveDir, identsFilename_GmCerts_)));
     if (open_File(f, writeOnly_FileMode)) {
         writeData_File(f, magicIdMeta_GmCerts_, 4);
@@ -362,7 +362,7 @@ void init_GmCerts(iGmCerts *d, const char *saveDir) {
 
 void deinit_GmCerts(iGmCerts *d) {
     iGuardMutex(d->mtx, {
-        saveIdentities_GmCerts_(d);
+        saveIdentities_GmCerts(d);
         iForEach(PtrArray, i, &d->idents) {
             delete_GmIdentity(i.ptr);
         }
diff --git a/src/gmcerts.h b/src/gmcerts.h
index af116433..a28c050e 100644
--- a/src/gmcerts.h
+++ b/src/gmcerts.h
@@ -82,6 +82,7 @@ iGmIdentity *       newIdentity_GmCerts     (iGmCerts *, int flags, iDate validU
 
 void                importIdentity_GmCerts  (iGmCerts *, iTlsCertificate *cert, const iString *notes); /* takes ownership */
 void                deleteIdentity_GmCerts  (iGmCerts *, iGmIdentity *identity);
+void                saveIdentities_GmCerts  (const iGmCerts *);
 
 const iString *     certificatePath_GmCerts (const iGmCerts *, const iGmIdentity *identity);
 
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index dd7b977e..1f5a6d01 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -1008,6 +1008,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 else {
                     signOut_GmCerts(certs_App(), tabUrl);
                 }
+                saveIdentities_GmCerts(certs_App());
                 updateItems_SidebarWidget_(d);
             }
             return iTrue;
@@ -1459,6 +1460,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
         iString icon;
         initUnicodeN_String(&icon, &d->icon, 1);
         iInt2 cPos = topLeft_Rect(itemRect);
+        const int indent = 1.4f * lineHeight_Text(font);
         addv_I2(&cPos,
                 init_I2(3 * gap_UI,
                         (itemHeight - lineHeight_Text(default_FontId) * 2 - lineHeight_Text(font)) /
@@ -1470,11 +1472,11 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
             font, cPos, d->listItem.isSelected ? iconColor : metaFg, range_String(&icon));
         deinit_String(&icon);
         drawRange_Text(d->listItem.isSelected ? uiContentBold_FontId : font,
-                       add_I2(cPos, init_I2(6 * gap_UI, 0)),
+                       add_I2(cPos, init_I2(indent, 0)),
                        fg,
                        range_String(&d->label));
         drawRange_Text(default_FontId,
-                       add_I2(cPos, init_I2(6 * gap_UI, lineHeight_Text(font))),
+                       add_I2(cPos, init_I2(indent, lineHeight_Text(font))),
                        metaFg,
                        range_String(&d->meta));
     }