Fix #1124, #1125 (#1276)

* Fix #1124, #1125 * fix clippy * update CHANGELOG.md Co-authored-by: Colin Rofls <[email protected]>
linebender · Oct 5, 2020 · db64ac1 · db64ac1
1 parent 9bae2f1
commit db64ac1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -99,6 +99,8 @@ You can find its changes [documented below](#060---2020-06-01).
 - Windows: fix crash on resize from incompatible resources ([#1191 by [@raphlinus]])
 - GTK: Related dependencies are now optional, facilitating a pure X11 build. ([#1241] by [@finnerale])
 - `widget::Image` now computes the layout correctly when unbound in one direction. ([#1189] by [@JAicewizard])
+- TextBox doesn't reset position after unfocused. ([#1276] by [@sysint64])
+- Able to select text in multiple TextBoxes at once. ([#1276] by [@sysint64])
 - The scroll bar now shows when the contents of a scrollable area change size. ([#1278] by [@Majora320])
 
 ### Visual
@@ -486,6 +488,7 @@ Last release without a changelog :(
 [#1251]: https://github.com/linebender/druid/pull/1251
 [#1252]: https://github.com/linebender/druid/pull/1252
 [#1255]: https://github.com/linebender/druid/pull/1255
+[#1276]: https://github.com/linebender/druid/pull/1276
 [#1278]: https://github.com/linebender/druid/pull/1278
 
 [Unreleased]: https://github.com/linebender/druid/compare/v0.6.0...master

diff --git a/druid/src/widget/textbox.rs b/druid/src/widget/textbox.rs
@@ -182,7 +182,7 @@ impl TextBox {
     }
 
     /// Edit a selection using a `Movement`.
-    fn move_selection(&mut self, mvmnt: Movement, text: &mut String, modify: bool) {
+    fn move_selection(&mut self, mvmnt: Movement, text: &impl EditableText, modify: bool) {
         // This movement function should ensure all movements are legit.
         // If they aren't, that's a problem with the movement function.
         self.selection = movement(mvmnt, self.selection, text, modify);
@@ -379,8 +379,11 @@ impl Widget<String> for TextBox {
                 ctx.register_for_focus();
                 self.text.set_text(data.as_str().into());
             }
-            LifeCycle::FocusChanged(true) => {
-                self.reset_cursor_blink(ctx.request_timer(CURSOR_BLINK_DURATION))
+            LifeCycle::FocusChanged(_) => {
+                self.move_selection(Movement::StartOfDocument, data, false);
+                self.update_hscroll();
+                self.reset_cursor_blink(ctx.request_timer(CURSOR_BLINK_DURATION));
+                ctx.request_paint();
             }
             _ => (),
         }