Fix bugs with textbox

vizia · Aug 13, 2022 · 4911532 · 4911532
1 parent 35ba460
commit 4911532
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 8 deletions.
diff --git a/crates/vizia_core/resources/themes/default_theme.css b/crates/vizia_core/resources/themes/default_theme.css
@@ -133,11 +133,10 @@ textbox:hover {
     background-color: #f6f6f6;
 }
 
-textbox:focus {
+textbox:checked {
     border-color: #4c00ff;
 }
-
-textbox:focus .textbox_content {
+textbox:checked .textbox_content {
     caret-color: #ff0000;
     selection-color: #6464c888;
 }

diff --git a/crates/vizia_core/src/context/backend.rs b/crates/vizia_core/src/context/backend.rs
@@ -491,7 +491,7 @@ impl<'a> BackendContext<'a> {
                     self.style().needs_restyle = true;
                 }
 
-                if matches!(*code, Code::Enter | Code::NumpadEnter | Code::Space) {
+                if matches!(*code, Code::Space) {
                     self.0.triggered = self.0.focused;
                     self.0.with_current(self.0.focused, |cx| {
                         cx.emit(WindowEvent::TriggerDown { mouse: false })
@@ -501,10 +501,7 @@ impl<'a> BackendContext<'a> {
                 self.0.event_queue.push_back(Event::new(event).target(self.0.focused));
             }
             WindowEvent::KeyUp(_, _) | WindowEvent::CharInput(_) => {
-                if matches!(
-                    event,
-                    WindowEvent::KeyUp(Code::Enter | Code::NumpadEnter | Code::Space, _)
-                ) {
+                if matches!(event, WindowEvent::KeyUp(Code::Space, _)) {
                     self.0.with_current(self.0.triggered, |cx| {
                         cx.emit(WindowEvent::TriggerUp { mouse: false })
                     });

diff --git a/crates/vizia_core/src/views/textbox.rs b/crates/vizia_core/src/views/textbox.rs
@@ -592,6 +592,39 @@ where
                 }
             }
 
+            WindowEvent::MouseDown(button) if *button == MouseButton::Left => {
+                if !cx.is_over() {
+                    cx.emit(TextEvent::Submit(false));
+                    if let Some(source) = cx.data::<L::Source>() {
+                        let text = self.lens.view(source, |t| {
+                            if let Some(t) = t {
+                                t.to_string()
+                            } else {
+                                "".to_owned()
+                            }
+                        });
+
+                        cx.emit(TextEvent::SelectAll);
+                        cx.emit(TextEvent::InsertText(text));
+                    };
+                    cx.release();
+                    cx.set_checked(false);
+
+                    // Forward event to hovered
+                    cx.event_queue.push_back(
+                        Event::new(WindowEvent::MouseDown(*button)).target(cx.hovered()),
+                    );
+                }
+            }
+
+            WindowEvent::FocusIn => {
+                cx.emit(TextEvent::StartEdit);
+            }
+
+            WindowEvent::FocusOut => {
+                cx.emit(TextEvent::EndEdit);
+            }
+
             WindowEvent::TriggerUp { .. } => {
                 cx.unlock_cursor_icon();
             }