Implement number and range pickers.

CHANGELOG.md

@@ -6,8 +6,11 @@
 
 #### Visual Environment
 
-#### EnsoGL (rendering engine)
+- [Components for picking numbers and ranges.][1524]. We now have some internal
+  re-usable UI components for selecting numbers or a range. Stay tuned for them
+  appearing in the IDE.
 
+#### EnsoGL (rendering engine)
 
 <br/>![Bug Fixes](/docs/assets/tags/bug_fixes.svg)
 
@@ -21,6 +24,8 @@ If you're interested in the enhancements and fixes made to the Enso compiler,
 you can find their release notes
 [here](https://github.com/enso-org/enso/blob/main/RELEASES.md).
 
+[1524]: https://github.com/enso-org/ide/pull/1524
+
 <br/>
 
 # Enso 2.0.0-alpha.4 (2021-05-04)
@@ -113,9 +118,6 @@ you can find their release notes
 
 - [Unified shadow generation][1411]. Added a toolset to create shadows for
   arbitrary UI components.
-- [Components for picking numbers and ranges.][1524]. We now have some internal
-  re-usable UI components for selecting numbers or a range. Stay tuned for them
-  appearing in the IDE.
 
 <br/>![Bug Fixes](/docs/assets/tags/bug_fixes.svg)
 
@@ -238,7 +240,9 @@ you can find their release notes
 [1438]: https://github.com/enso-org/ide/pull/1438
 [1367]: https://github.com/enso-org/ide/pull/1367
 [1445]: https://github.com/enso-org/ide/pull/1445
-[1524]: https://github.com/enso-org/ide/pull/1524
+[1447]: https://github.com/enso-org/ide/pull/1447
+[1471]: https://github.com/enso-org/ide/pull/1471
+[1511]: https://github.com/enso-org/ide/pull/1511
 
 <br/>
 

src/rust/ensogl/example/src/leak.rs

@@ -0,0 +1,39 @@
+//! `Leak` is a utility struct that prevents the wrapped value from being dropped when `Leak` is
+//! being dropped. This is achieved by passing the contained value to `std::mem::forget` in the
+//! drop implementation iof `Leak`. Can bue used in examples to keep components alive for the whole
+//! lifetime of the application.
+
+
+
+/// Wrapper that will prevent the wrapped value from being dropped. Instead, the value will be
+/// leaked when the `Leak` is dropped.
+#[derive(Debug)]
+pub struct Leak<T> {
+    value: Option<T>
+}
+
+impl<T> Leak<T> {
+    /// Constructor. The passed value will be prevented from being dropped. This will cause memory
+    /// leaks.
+    pub fn new(value:T) -> Self {
+        Self{value:Some(value)}
+    }
+
+    /// Return a reference to the wrapped value.
+    pub fn inner(&self) -> &T {
+        // Guaranteed to never panic as this is always initialised with `Some` in the constructor.
+        self.value.as_ref().unwrap()
+    }
+
+    /// Return a mutable reference to the wrapped value.
+    pub fn inner_mut(&mut self) -> &mut T {
+        // Guaranteed to never panic as this is always initialised with `Some` in the constructor.
+        self.value.as_mut().unwrap()
+    }
+}
+
+impl<T> Drop for Leak<T> {
+    fn drop(&mut self) {
+        std::mem::forget(self.value.take());
+    }
+}

src/rust/ensogl/example/src/lib.rs

@@ -28,6 +28,7 @@
 
 #[allow(clippy::option_map_unit_fn)]
 
+mod leak;
 pub mod animation;
 pub mod complex_shape_system;
 pub mod dom_symbols;
@@ -44,4 +45,5 @@ pub mod text_area;
 /// Common types that should be visible across the whole crate.
 pub mod prelude {
     pub use ensogl_core::prelude::*;
+    pub use super::leak::*;
 }

src/rust/ensogl/example/src/slider.rs

@@ -4,8 +4,10 @@ use crate::prelude::*;
 use wasm_bindgen::prelude::*;
 
 use ensogl_core::application::Application;
+use ensogl_core::data::color;
 use ensogl_core::display::object::ObjectOps;
 use ensogl_core::system::web;
+use ensogl_gui_components::selector::Bounds;
 use ensogl_gui_components::selector;
 use ensogl_text_msdf_sys::run_once_initialized;
 use ensogl_theme as theme;
@@ -30,38 +32,18 @@ pub fn entry_point_slider() {
     });
 }
 
-fn make_number_picker(app:&Application) -> NeverDrop<selector::NumberPicker> {
+fn make_number_picker(app:&Application) -> Leak<selector::NumberPicker> {
     let slider = app.new_view::<selector::NumberPicker>();
     slider.frp.resize(Vector2(200.0,50.0));
     app.display.add_child(&slider);
-    NeverDrop::new(slider)
+    Leak::new(slider)
 }
 
-fn make_range_picker(app:&Application) -> NeverDrop<selector::NumberRangePicker> {
+fn make_range_picker(app:&Application) -> Leak<selector::NumberRangePicker> {
     let slider = app.new_view::<selector::NumberRangePicker>();
     slider.frp.resize(Vector2(400.0,50.0));
     app.display.add_child(&slider);
-    NeverDrop::new(slider)
-}
-
-// Utility struct that leaks a struct instead of dropping it. Will cause memory leaks.
-struct NeverDrop<T> {
-    value: Option<T>
-}
-
-impl<T> NeverDrop<T> {
-    fn new(value:T) -> Self {
-        NeverDrop{value:Some(value)}
-    }
-    fn inner(&self) -> &T {
-        self.value.as_ref().unwrap()
-    }
-}
-
-impl<T> Drop for NeverDrop<T> {
-    fn drop(&mut self) {
-        std::mem::forget(self.value.take());
-    }
+    Leak::new(slider)
 }
 
 
@@ -77,18 +59,21 @@ fn init(app:&Application) {
 
     let slider1 = make_number_picker(app);
     slider1.inner().frp.allow_click_selection(true);
+
     let slider2 = make_number_picker(app);
     slider2.inner().frp.resize(Vector2(400.0,50.0));
-    slider2.inner().frp.set_bounds.emit((-100.0,100.0));
+    slider2.inner().frp.set_bounds.emit(Bounds::new(-100.0,100.0));
     slider2.inner().set_position_y(50.0);
-    slider2.inner().frp.use_overflow_bounds((-150.0,200.0));
+    slider2.inner().frp.use_overflow_bounds(Bounds::new(-150.0,200.0));
     slider2.inner().frp.set_caption(Some("Value:".to_string()));
 
     let slider3 = make_range_picker(app);
     slider3.inner().set_position_y(-100.0);
+    slider3.inner().set_track_color(color::Rgba::new(0.0,0.80,0.80,1.0));
 
     let slider4 = make_range_picker(app);
     slider4.inner().set_position_y(-200.0);
-    slider4.inner().frp.use_overflow_bounds((-2.0,3.0));
+    slider4.inner().frp.use_overflow_bounds(Bounds::new(-2.0,3.0));
     slider4.inner().frp.set_caption(Some("Caption".to_string()));
+    slider4.inner().set_track_color(color::Rgba::new(0.5,0.70,0.70,1.0));
 }

src/rust/ensogl/lib/components/Cargo.toml

@@ -19,3 +19,4 @@ ensogl-theme = { path = "../theme" }
 
 [dev-dependencies]
 wasm-bindgen-test = { version = "0.3.8" }
+float_eq          = "0.5"

src/rust/ensogl/lib/components/src/selector.rs

@@ -6,11 +6,12 @@ mod common;
 use ensogl_core::application;
 use ensogl_core::application::Application;
 
+pub use common::Bounds;
 
 
-// ====================
+// =====================
 // === Number Picker ===
-// ====================
+// =====================
 
 /// UI component for selecting a number.
 pub type NumberPicker = crate::component::Component<common::Model,number::Frp>;
@@ -23,9 +24,9 @@ impl application::View for NumberPicker {
 
 
 
-// =========================
+// ===========================
 // === Number Range Picker ===
-// =========================
+// ===========================
 
 /// UI component for selecting a number.
 pub type NumberRangePicker = crate::component::Component<common::Model,range::Frp>;