Dark-Alex-17/managarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a bug that no longer reset horizontally scrollable text once the selection changed

Browse Source
This commit is contained in:
Dark-Alex-17
2023-08-08 10:50:06 -06:00
parent 9a59ee0af9
commit 9be4affec5
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/models/mod.rs
+18 -4
View File
@@ -225,6 +225,8 @@ impl HorizontallyScrollableText {
} else { } else {
self.reset_offset(); self.reset_offset();
} }
} else if *self.offset.borrow() != 0 && !is_current_selection {
self.reset_offset();
} }
} }
@@ -562,19 +564,31 @@ mod tests {
horizontally_scrollable_text.scroll_left_or_reset(width, false, true); horizontally_scrollable_text.scroll_left_or_reset(width, false, true);
assert_eq!(*horizontally_scrollable_text.offset.borrow(), 1); assert_eq!(*horizontally_scrollable_text.offset.borrow(), 0);
horizontally_scrollable_text.scroll_left_or_reset(width, true, false); horizontally_scrollable_text.scroll_left_or_reset(width, true, false);
assert_eq!(*horizontally_scrollable_text.offset.borrow(), 1); assert_eq!(*horizontally_scrollable_text.offset.borrow(), 0);
horizontally_scrollable_text.scroll_left_or_reset(width, true, true); horizontally_scrollable_text.scroll_left_or_reset(width, true, true);
assert_eq!(*horizontally_scrollable_text.offset.borrow(), 2); assert_eq!(*horizontally_scrollable_text.offset.borrow(), 1);
horizontally_scrollable_text.scroll_left_or_reset(test_text.len(), false, true); horizontally_scrollable_text.scroll_left_or_reset(test_text.len(), false, true);
assert_eq!(*horizontally_scrollable_text.offset.borrow(), 2); assert_eq!(*horizontally_scrollable_text.offset.borrow(), 0);
}
#[test]
fn test_horizontally_scrollable_test_scroll_or_reset_resets_when_text_unselected() {
let horizontally_scrollable_test = HorizontallyScrollableText::from("Test string".to_owned());
horizontally_scrollable_test.scroll_left();
assert_eq!(*horizontally_scrollable_test.offset.borrow(), 1);
horizontally_scrollable_test.scroll_left_or_reset(3, true, false);
assert_eq!(*horizontally_scrollable_test.offset.borrow(), 0);
} }
#[test] #[test]