Merge pull request #660 from kas-gui/push-puqoyzywsrnm

Remove type parameter D: DrawImpl from kas::theme::dimensions::Window

Author: dhardy

crates/kas-core/src/theme/anim.rs

@@ -7,7 +7,6 @@
 
 use crate::Id;
 use crate::draw::DrawImpl;
-use std::marker::PhantomData;
 use std::time::{Duration, Instant};
 
 #[derive(Debug)]
@@ -18,14 +17,13 @@ struct Config {
 
 /// State holding theme animation data
 #[derive(Debug)]
-pub struct AnimState<D> {
+pub struct AnimState {
     c: Config,
     now: Instant, // frame start time
     text_cursor: TextCursor,
-    _d: PhantomData<D>,
 }
 
-impl<D> AnimState<D> {
+impl AnimState {
     pub fn new(config: &crate::config::ThemeConfig) -> Self {
         let c = Config {
             cursor_blink_rate: config.cursor_blink_rate(),
@@ -41,7 +39,6 @@ impl<D> AnimState<D> {
                 state: false,
                 time: now,
             },
-            _d: PhantomData,
         }
     }
 
@@ -61,11 +58,14 @@ struct TextCursor {
     state: bool,
     time: Instant,
 }
-impl<D: DrawImpl> AnimState<D> {
+impl AnimState {
     /// Flashing text cursor: return true to draw
     ///
     /// Assumption: only one widget may draw a text cursor at any time.
-    pub fn text_cursor(&mut self, draw: &mut D, id: &Id, byte: usize) -> bool {
+    pub fn text_cursor<D>(&mut self, draw: &mut D, id: &Id, byte: usize) -> bool
+    where
+        D: DrawImpl,
+    {
         let entry = &mut self.text_cursor;
         let widget = id.to_nzu64().get();
         if entry.widget == widget && entry.byte == byte {
@@ -86,12 +86,15 @@ impl<D: DrawImpl> AnimState<D> {
     }
 }
 
-impl<D: DrawImpl> AnimState<D> {
+impl AnimState {
     /// Fade over a boolean transition
     ///
     /// Normally returns `1.0` if `state` else `0.0`, but within a short time
     /// after a state change will linearly transition between these values.
-    pub fn fade_bool(&mut self, draw: &mut D, state: bool, last_change: Option<Instant>) -> f32 {
+    pub fn fade_bool<D>(&mut self, draw: &mut D, state: bool, last_change: Option<Instant>) -> f32
+    where
+        D: DrawImpl,
+    {
         if let Some(dur) = last_change.and_then(|inst| self.elapsed(inst))
             && dur < self.c.fade_dur
         {

crates/kas-core/src/theme/dimensions.rs

@@ -160,14 +160,14 @@ impl Dimensions {
     }
 }
 
-/// A convenient implementation of [`crate::window::Window`]
-pub struct Window<D> {
+/// A convenient implementation of [`crate::theme::Window`]
+pub struct Window {
     pub config: Rc<RefCell<Config>>,
     pub dims: Dimensions,
-    pub anim: AnimState<D>,
+    pub anim: AnimState,
 }
 
-impl<D> Window<D> {
+impl Window {
     pub fn new(dims: &Parameters, config: &WindowConfig) -> Self {
         Window {
             config: config.clone_base(),
@@ -187,7 +187,7 @@ impl<D> Window<D> {
     }
 }
 
-impl<D: 'static> super::Window for Window<D> {
+impl super::Window for Window {
     fn size(&self) -> &dyn ThemeSize {
         self
     }
@@ -197,7 +197,7 @@ impl<D: 'static> super::Window for Window<D> {
     }
 }
 
-impl<D: 'static> ThemeSize for Window<D> {
+impl ThemeSize for Window {
     fn scale_factor(&self) -> f32 {
         self.dims.scale
     }

crates/kas-core/src/theme/flat_theme.rs

@@ -79,15 +79,15 @@ fn dimensions() -> dim::Parameters {
 pub struct DrawHandle<'a, DS: DrawSharedImpl> {
     pub(crate) draw: DrawIface<'a, DS>,
     pub(crate) ev: &'a mut EventState,
-    pub(crate) w: &'a mut dim::Window<DS::Draw>,
+    pub(crate) w: &'a mut dim::Window,
     pub(crate) cols: &'a ColorsLinear,
 }
 
 impl<DS: DrawSharedImpl> Theme<DS> for FlatTheme
 where
     DS::Draw: DrawRoundedImpl,
 {
-    type Window = dim::Window<DS::Draw>;
+    type Window = dim::Window;
     type Draw<'a> = DrawHandle<'a, DS>;
 
     fn init(&mut self, config: &RefCell<Config>) {

crates/kas-core/src/theme/simple_theme.rs

@@ -55,12 +55,12 @@ impl SimpleTheme {
 pub struct DrawHandle<'a, DS: DrawSharedImpl> {
     pub(crate) draw: DrawIface<'a, DS>,
     pub(crate) ev: &'a mut EventState,
-    pub(crate) w: &'a mut dim::Window<DS::Draw>,
+    pub(crate) w: &'a mut dim::Window,
     pub(crate) cols: &'a ColorsLinear,
 }
 
 impl<DS: DrawSharedImpl> Theme<DS> for SimpleTheme {
-    type Window = dim::Window<DS::Draw>;
+    type Window = dim::Window;
     type Draw<'a> = DrawHandle<'a, DS>;
 
     fn init(&mut self, _: &RefCell<Config>) {}

crates/kas-wgpu/src/shaded_theme.rs

@@ -68,15 +68,15 @@ const NORMS_RAISED: (f32, f32) = (0.0, 0.7);
 pub struct DrawHandle<'a, DS: DrawSharedImpl> {
     draw: DrawIface<'a, DS>,
     ev: &'a mut EventState,
-    w: &'a mut dim::Window<DS::Draw>,
+    w: &'a mut dim::Window,
     cols: &'a ColorsLinear,
 }
 
 impl<DS: DrawSharedImpl> Theme<DS> for ShadedTheme
 where
     DS::Draw: DrawRoundedImpl + DrawShadedImpl,
 {
-    type Window = dim::Window<DS::Draw>;
+    type Window = dim::Window;
     type Draw<'a> = DrawHandle<'a, DS>;
 
     fn init(&mut self, config: &RefCell<Config>) {