Give focus back (#379)

src/context.rs

@@ -702,6 +702,8 @@ impl<'a> EventCx<'a> {
             return EventPropagation::Stop;
         }
 
+        let mut is_down_and_has_click = false;
+
         match &event {
             Event::PointerDown(event) => {
                 self.app_state.clicking.insert(id);
@@ -723,6 +725,7 @@ impl<'a> EventCx<'a> {
                         if self.has_event_listener(id, EventListener::Click) {
                             let view_state = self.app_state.view_state(id);
                             view_state.last_pointer_down = Some(event.clone());
+                            is_down_and_has_click = true;
                         }
 
                         let bottom_left = {
@@ -945,6 +948,10 @@ impl<'a> EventCx<'a> {
             }
         }
 
+        if is_down_and_has_click {
+            return EventPropagation::Stop;
+        }
+
         EventPropagation::Continue
     }
 

src/window_handle.rs

@@ -318,6 +318,22 @@ impl WindowHandle {
                 }
             }
         }
+
+        if let Event::PointerDown(event) = &event {
+            if cx.app_state.focus.is_none() {
+                if let Some(id) = was_focused {
+                    let layout = cx.app_state.get_layout_rect(id);
+                    if layout.contains(event.pos) {
+                        // if the event is pointer down
+                        // and the focus hasn't been set to anything new
+                        // and the pointer down event is inside the previously focusd view
+                        // we then set the focus back to that view
+                        cx.app_state.focus = Some(id);
+                    }
+                }
+            }
+        }
+
         if was_focused != cx.app_state.focus {
             cx.app_state.focus_changed(was_focused, cx.app_state.focus);
         }