Cargo.lock

@@ -2111,7 +2111,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "letterbox"
-version = "0.0.21"
+version = "0.0.20"
 dependencies = [
  "build-info",
  "build-info-build",
@@ -2516,7 +2516,7 @@ dependencies = [
 
 [[package]]
 name = "notmuch"
-version = "0.0.21"
+version = "0.0.20"
 dependencies = [
  "itertools 0.10.5",
  "log",
@@ -3121,7 +3121,7 @@ dependencies = [
 
 [[package]]
 name = "procmail2notmuch"
-version = "0.0.21"
+version = "0.0.20"
 dependencies = [
  "anyhow",
 ]
@@ -3908,7 +3908,7 @@ dependencies = [
 
 [[package]]
 name = "server"
-version = "0.0.21"
+version = "0.0.20"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3994,7 +3994,7 @@ dependencies = [
 
 [[package]]
 name = "shared"
-version = "0.0.21"
+version = "0.0.20"
 dependencies = [
  "build-info",
  "notmuch",

notmuch/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "notmuch"
-version = "0.0.21"
+version = "0.0.20"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

procmail2notmuch/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "procmail2notmuch"
-version = "0.0.21"
+version = "0.0.20"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "server"
-version = "0.0.21"
+version = "0.0.20"
 edition = "2021"
 default-run = "server"
 

shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "shared"
-version = "0.0.21"
+version = "0.0.20"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

web/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-version = "0.0.21"
+version = "0.0.20"
 name = "letterbox"
 repository = "https://github.com/seed-rs/seed-quickstart"
 authors = ["Bill Thiede <git@xinu.tv>"]

web/src/state.rs

@@ -332,8 +332,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
                 selected_threads,
             };
             orders.send_msg(Msg::UpdateServerVersion(data.version));
-            // Generate signal so progress bar is reset
-            orders.send_msg(Msg::WindowScrolled);
         }
 
         Msg::ShowThreadRequest { thread_id } => {
@@ -384,8 +382,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
                 }
             }
             orders.send_msg(Msg::UpdateServerVersion(data.version));
-            // Generate signal so progress bar is reset
-            orders.send_msg(Msg::WindowScrolled);
         }
         Msg::ShowThreadResult(bad) => {
             error!("show_thread_query error: {bad:#?}");
@@ -515,29 +511,9 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
                     .value_of();
 
                 let r = el.get_bounding_client_rect();
-                if r.height() < ih {
-                    // The whole content fits in the window, no scrollbar
-                    orders.send_msg(Msg::SetProgress(0.));
-                    return;
-                }
-                let end: f64 = r.height() - ih;
-                if end < 0. {
-                    orders.send_msg(Msg::SetProgress(0.));
-                    return;
-                }
-                // Flip Y, normally it's 0-point when the top of the content hits the top of the
-                // screen and goes negative from there.
+                let end = r.height() - ih;
                 let y = -r.y();
-                let ratio: f64 = (y / end).max(0.);
-                debug!(
-                    "WindowScrolled ih {ih} end {end} ratio {ratio:.02} {}x{} @ {},{}",
-                    r.width(),
-                    r.height(),
-                    r.x(),
-                    r.y()
-                );
-
-                orders.send_msg(Msg::SetProgress(ratio));
+                orders.send_msg(Msg::SetProgress((y / end).max(0.)));
             } else {
                 orders.send_msg(Msg::SetProgress(0.));
             }