refactor

crates/core/src/slider.rs

@@ -3,12 +3,12 @@ use std::rc::Rc;
 
 use gpui::prelude::FluentBuilder as _;
 use gpui::{
-    App, Bounds, BoxShadow, DispatchPhase, ElementId, InteractiveElement as _, IntoElement,
-    KeyDownEvent, MouseButton, MouseMoveEvent, MouseUpEvent, ParentElement as _, Pixels,
-    RenderOnce, Role, SharedString, StatefulInteractiveElement as _, Styled as _, Window, canvas,
-    div, px, relative,
+    App, Bounds, DispatchPhase, ElementId, InteractiveElement as _, IntoElement, KeyDownEvent,
+    MouseButton, MouseMoveEvent, MouseUpEvent, ParentElement as _, Pixels, RenderOnce, Role,
+    SharedString, StatefulInteractiveElement as _, Styled as _, Window, canvas, div, relative,
 };
 use gpui_native_theme::{ActiveTheme as _, Size};
+use gpui_native_utils::focus_ring;
 
 use crate::common::{Sizable, h_flex};
 
@@ -138,15 +138,12 @@ impl RenderOnce for Slider {
         // The track bounds, recorded by the overlay canvas each frame,
         // turn pointer positions into values inside the listeners.
         let bounds_cell = Rc::new(Cell::new(None::<Bounds<Pixels>>));
-
         // Dragging crosses frames, so it lives in keyed element state,
         // a per-render flag would reset when the owner's update repaints.
         let dragging = window.use_keyed_state("slider-dragging", cx, |_, _| false);
-
         // A held handle gives the arrow-key listener something to check focus against,
         // and the click-to-focus behavior a target.
-        let focus = window.use_keyed_state("slider-focus", cx, |_, cx| cx.focus_handle());
-        let focus_handle = focus.read(cx).clone();
+        let focus_handle = gpui_native_utils::focus_handle(&self.id, window, cx);
 
         let set_value: ValueSetter = {
             let bounds_cell = bounds_cell.clone();
@@ -188,11 +185,7 @@ impl RenderOnce for Slider {
                 slider
                     .track_focus(&focus_handle)
                     .tab_stop(true)
-                    .focus_visible(|style| {
-                        style.shadow(vec![
-                            BoxShadow::new(px(0.), px(0.), colors.ring).spread_radius(px(3.)),
-                        ])
-                    })
+                    .focus_visible(|style| style.shadow(focus_ring(colors.ring)))
                     .on_mouse_down(MouseButton::Left, move |event, window, cx| {
                         down_dragging.update(cx, |dragging, _| *dragging = true);
                         down_set_value(event.position.x, window, cx);