Swiping and sidebar; various tweaks

When a page is opened from the sidebar, swiping back will now reopen the sidebar. Another swipe will dismiss the sidebar and navigate back as usual.

Attempted to cache theme colors in GmDocument, but there were issues with theme changes.

1 files changed, 27 insertions, 4 deletions

diff --git a/src/history.c b/src/history.c
index d23fb290..c592838e 100644
--- a/src/history.c
+++ b/src/history.c
@@ -37,6 +37,7 @@ void init_RecentUrl(iRecentUrl *d) {
     d->normScrollY    = 0;
     d->cachedResponse = NULL;
     d->cachedDoc      = NULL;
+    d->flags.openedFromSidebar = iFalse;
 }
 
 void deinit_RecentUrl(iRecentUrl *d) {
@@ -53,6 +54,7 @@ iRecentUrl *copy_RecentUrl(const iRecentUrl *d) {
     copy->normScrollY    = d->normScrollY;
     copy->cachedResponse = d->cachedResponse ? copy_GmResponse(d->cachedResponse) : NULL;
     copy->cachedDoc      = ref_Object(d->cachedDoc);
+    copy->flags          = d->flags;
     return copy;
 }
 
@@ -171,6 +173,7 @@ void serialize_History(const iHistory *d, iStream *outs) {
         const iRecentUrl *item = i.value;
         serialize_String(&item->url, outs);
         write32_Stream(outs, item->normScrollY * 1.0e6f);
+        writeU16_Stream(outs, item->flags.openedFromSidebar ? iBit(1) : 0);
         if (item->cachedResponse) {
             write8_Stream(outs, 1);
             serialize_GmResponse(item->cachedResponse, outs);
@@ -192,6 +195,12 @@ void deserialize_History(iHistory *d, iStream *ins) {
         init_RecentUrl(&item);
         deserialize_String(&item.url, ins);
         item.normScrollY = (float) read32_Stream(ins) / 1.0e6f;
+        if (version_Stream(ins) >= addedRecentUrlFlags_FileVersion) {
+            uint16_t flags = readU16_Stream(ins);
+            if (flags & iBit(1)) {
+                item.flags.openedFromSidebar = iTrue;
+            }
+        }
         if (read8_Stream(ins)) {
             item.cachedResponse = new_GmResponse();
             deserialize_GmResponse(item.cachedResponse, ins);
@@ -378,12 +387,15 @@ void setCachedResponse_History(iHistory *d, const iGmResponse *response) {
     unlock_Mutex(d->mtx);
 }
 
-void setCachedDocument_History(iHistory *d, iGmDocument *doc) {
+void setCachedDocument_History(iHistory *d, iGmDocument *doc, iBool openedFromSidebar) {
     lock_Mutex(d->mtx);
     iRecentUrl *item = mostRecentUrl_History(d);
-    if (item && item->cachedDoc != doc) {
-        iRelease(item->cachedDoc);
-        item->cachedDoc = ref_Object(doc);
+    if (item) {
+        item->flags.openedFromSidebar = openedFromSidebar;
+        if (item->cachedDoc != doc) {
+            iRelease(item->cachedDoc);
+            item->cachedDoc = ref_Object(doc);
+        }
     }
     unlock_Mutex(d->mtx);
 }
@@ -487,6 +499,17 @@ size_t pruneLeastImportantMemory_History(iHistory *d) {
     return delta;
 }
 
+void invalidateTheme_History(iHistory *d) {
+    lock_Mutex(d->mtx);
+    iForEach(Array, i, &d->recent) {
+        iRecentUrl *r = i.value;
+        if (r->cachedDoc) {
+            invalidatePalette_GmDocument(r->cachedDoc);
+        }
+    }
+    unlock_Mutex(d->mtx);
+}
+
 const iStringArray *searchContents_History(const iHistory *d, const iRegExp *pattern) {
     iStringArray *urls = iClob(new_StringArray());
     lock_Mutex(d->mtx);