Merge pull request #150 from hecrj/update/iced

Update `iced` to official `master`
squidowl · Jul 13, 2023 · 4547ba1 · 4547ba1
2 parents a78540b + 76b25c5
commit 4547ba1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -35,5 +35,5 @@ embed-resource = "2.1.1"
 members = ["data"]
 
 [patch.crates-io]
-iced = { git = "https://github.com/tarkah/iced", rev = "bcf1ee1bb853bc62fc709d71fa37de1ab6fea6e1" }
-iced_core = { git = "https://github.com/tarkah/iced", rev = "bcf1ee1bb853bc62fc709d71fa37de1ab6fea6e1" }
+iced = { git = "https://github.com/iced-rs/iced", rev = "fca8373516cdaefcb8595b4d544407792a4cfcc0" }
+iced_core = { git = "https://github.com/iced-rs/iced", rev = "fca8373516cdaefcb8595b4d544407792a4cfcc0" }
diff --git a/src/buffer/scroll_view.rs b/src/buffer/scroll_view.rs
@@ -292,16 +292,13 @@ impl Status {
  let old = self.alignment();
  let new = other.alignment();
 
- let absolute_offset = viewport.absolute_offset();
-
  if old != new {
- let scrollable::AbsoluteOffset { x, y } = absolute_offset;
-
- let scroll_height = (viewport.content_bounds.height - viewport.bounds.height).max(0.0);
+ let offset = viewport.absolute_offset();
+ let reversed_offset = viewport.absolute_offset_reversed();
 
  Some(scrollable::AbsoluteOffset {
- x,
- y: (scroll_height - y).max(0.0),
+ x: offset.x,
+ y: reversed_offset.y,
  })
  } else {
  None