3 files changed, 74 insertions, 12 deletions

diff --git a/src/ui/util.c b/src/ui/util.c
index 6c9d75dc..e1db3129 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -370,6 +370,7 @@ static iBool isCommandIgnoredByMenus_(const char *cmd) {
     return equal_Command(cmd, "media.updated") || equal_Command(cmd, "media.player.update") ||
            startsWith_CStr(cmd, "feeds.update.") ||
            equal_Command(cmd, "document.request.updated") || equal_Command(cmd, "window.resized") ||
+           equal_Command(cmd, "window.reload.update") ||
            (equal_Command(cmd, "mouse.clicked") && !arg_Command(cmd)); /* button released */
 }
 
@@ -748,11 +749,6 @@ iWidget *makeSheet_Widget(const char *id) {
 
 void centerSheet_Widget(iWidget *sheet) {
     arrange_Widget(sheet->parent);
-//    const iInt2 rootSize = rootSize_Window(get_Window());
-//    const iInt2 orig     = localCoord_Widget(
-//        sheet->parent,
-//        init_I2(rootSize.x / 2 - sheet->rect.size.x / 2, bounds_Widget(sheet).pos.y));
-//    sheet->rect.pos = orig;
     postRefresh_App();
 }
 
diff --git a/src/ui/window.c b/src/ui/window.c
index 6199c4e2..d2ec6822 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -193,7 +193,38 @@ static const iMenuItem identityButtonMenuItems_[] = {
 };
 
 static const char *reloadCStr_ = "\U0001f503";
-static const char *stopCStr_   = uiTextCaution_ColorEscape "\U0001f310";
+static const char *stopSeqCStr_[] = {
+    uiTextCaution_ColorEscape "\U0001fb00",
+    uiTextCaution_ColorEscape "\U0001fb01",
+    uiTextCaution_ColorEscape "\U0001fb07",
+    uiTextCaution_ColorEscape "\U0001fb1e",
+    uiTextCaution_ColorEscape "\U0001fb0f",
+    uiTextCaution_ColorEscape "\U0001fb03",
+    uiTextCaution_ColorEscape "\U0001fb00",
+    uiTextCaution_ColorEscape "\U0001fb01",
+    uiTextCaution_ColorEscape "\U0001fb07",
+    uiTextCaution_ColorEscape "\U0001fb1e",
+    uiTextCaution_ColorEscape "\U0001fb0f",
+    uiTextCaution_ColorEscape "\U0001fb03",
+
+    uiTextCaution_ColorEscape "\U0001fb7d",
+    uiTextCaution_ColorEscape "\U0001fb7e",
+    uiTextCaution_ColorEscape "\U0001fb7f",
+    uiTextCaution_ColorEscape "\U0001fb7c",
+    uiTextCaution_ColorEscape "\U0001fb7d",
+    uiTextCaution_ColorEscape "\U0001fb7e",
+    uiTextCaution_ColorEscape "\U0001fb7f",
+    uiTextCaution_ColorEscape "\U0001fb7c",
+
+    uiTextCaution_ColorEscape "\U0001fb00",
+    uiTextCaution_ColorEscape "\U0001fb01",
+    uiTextCaution_ColorEscape "\U0001fb07",
+    uiTextCaution_ColorEscape "\U0001fb03",
+    uiTextCaution_ColorEscape "\U0001fb0f",
+    uiTextCaution_ColorEscape "\U0001fb1e",
+    uiTextCaution_ColorEscape "\U0001fb07",
+    uiTextCaution_ColorEscape "\U0001fb03",
+};
 
 static void updateNavBarIdentity_(iWidget *navBar) {
     const iGmIdentity *ident =
@@ -210,6 +241,37 @@ static void updateNavBarIdentity_(iWidget *navBar) {
     setFlags_Widget(as_Widget(idItem), disabled_WidgetFlag, !ident);
 }
 
+static const int loadAnimIntervalMs_ = 200;
+static int loadAnimIndex_ = 0;
+
+static const char *loadAnimationCStr_(void) {
+    return stopSeqCStr_[loadAnimIndex_ % iElemCount(stopSeqCStr_)];
+}
+
+static uint32_t updateReloadAnimation_Window_(uint32_t interval, void *window) {
+    iUnused(window);
+    loadAnimIndex_++;
+    postCommand_App("window.reload.update");
+    return interval;
+}
+
+static void setReloadLabel_Window_(iWindow *d, iBool animating) {
+    updateTextCStr_LabelWidget(findChild_Widget(d->root, "reload"),
+                               animating ? loadAnimationCStr_() : reloadCStr_);
+}
+
+static void checkLoadAnimation_Window_(iWindow *d) {
+    const iBool isOngoing = isRequestOngoing_DocumentWidget(document_App());
+    if (isOngoing && !d->loadAnimTimer) {
+        d->loadAnimTimer = SDL_AddTimer(loadAnimIntervalMs_, updateReloadAnimation_Window_, d);
+    }
+    else if (!isOngoing && d->loadAnimTimer) {
+        SDL_RemoveTimer(d->loadAnimTimer);
+        d->loadAnimTimer = 0;
+    }
+    setReloadLabel_Window_(d, isOngoing);
+}
+
 static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
     if (equal_Command(cmd, "window.resized")) {
         const iBool isNarrow = width_Rect(bounds_Widget(navBar)) / gap_UI < 140;
@@ -230,6 +292,10 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
         postCommand_Widget(navBar, "layout.changed id:navbar");
         return iFalse;
     }
+    else if (equal_Command(cmd, "window.reload.update")) {
+        checkLoadAnimation_Window_(get_Window());
+        return iTrue;
+    }
     else if (equal_Command(cmd, "navigate.focus")) {
         iWidget *url = findChild_Widget(navBar, "url");
         if (focus_Widget() != url) {
@@ -267,25 +333,24 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
     else if (startsWith_CStr(cmd, "document.")) {
         /* React to the current document only. */
         if (document_Command(cmd) == document_App()) {
-            iLabelWidget *reloadButton = findChild_Widget(navBar, "reload");
             if (equal_Command(cmd, "document.changed")) {
                 iInputWidget *url = findWidget_App("url");
                 const iString *urlStr = collect_String(suffix_Command(cmd, "url"));
                 visitUrl_Visited(visited_App(), urlStr, 0);
                 postCommand_App("visited.changed"); /* sidebar will update */
                 setText_InputWidget(url, urlStr);
-                updateTextCStr_LabelWidget(reloadButton, reloadCStr_);
+                checkLoadAnimation_Window_(get_Window());
                 updateNavBarIdentity_(navBar);
                 return iFalse;
             }
             else if (equal_Command(cmd, "document.request.cancelled")) {
-                updateTextCStr_LabelWidget(reloadButton, reloadCStr_);
+                checkLoadAnimation_Window_(get_Window());
                 return iFalse;
             }
             else if (equal_Command(cmd, "document.request.started")) {
                 iInputWidget *url = findChild_Widget(navBar, "url");
                 setTextCStr_InputWidget(url, suffixPtr_Command(cmd, "url"));
-                updateTextCStr_LabelWidget(reloadButton, stopCStr_);
+                checkLoadAnimation_Window_(get_Window());
                 return iFalse;
             }
         }
@@ -295,8 +360,7 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
         iDocumentWidget *doc = document_App();
         if (doc) {
             setText_InputWidget(findChild_Widget(navBar, "url"), url_DocumentWidget(doc));
-            updateTextCStr_LabelWidget(findChild_Widget(navBar, "reload"),
-                                       isRequestOngoing_DocumentWidget(doc) ? stopCStr_ : reloadCStr_);
+            checkLoadAnimation_Window_(get_Window());
             updateNavBarIdentity_(navBar);
         }
         setFocus_Widget(NULL);
@@ -642,6 +706,7 @@ void init_Window(iWindow *d, iRect rect) {
     d->root = new_Widget();
     d->presentTime = 0.0;
     d->frameTime = SDL_GetTicks();
+    d->loadAnimTimer = 0;
     setId_Widget(d->root, "root");
     init_Text(d->render);
     setupUserInterface_Window(d);
diff --git a/src/ui/window.h b/src/ui/window.h
index 2b68d7aa..4b6a6e7a 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -47,6 +47,7 @@ struct Impl_Window {
     double        presentTime;
     SDL_Cursor *  cursors[SDL_NUM_SYSTEM_CURSORS];
     SDL_Cursor *  pendingCursor;
+    int           loadAnimTimer;
 };
 
 iBool       processEvent_Window     (iWindow *, const SDL_Event *);