Move MultiTheme to kas::theme

Author: dhardy

kas-wgpu/examples/gallery.rs

@@ -136,7 +136,7 @@ fn main() -> Result<(), kas_wgpu::Error> {
     );
 
     #[cfg(feature = "stack_dst")]
-    let theme = kas_wgpu::theme::MultiTheme::builder()
+    let theme = kas::theme::MultiTheme::builder()
         .add("shaded", kas_wgpu::theme::ShadedTheme::new())
         .add("flat", kas_wgpu::theme::FlatTheme::new())
         .build();

kas-wgpu/src/lib.rs

@@ -6,10 +6,6 @@
 //! Toolkit for kas
 
 #![cfg_attr(feature = "gat", feature(generic_associated_types))]
-#![feature(unsize)]
-
-#[cfg(all(feature = "gat", feature = "stack_dst"))]
-compile_error!("Crate features 'gat' and 'stack_dst' are incompatible.");
 
 pub mod draw;
 mod event_loop;

kas-wgpu/src/theme/mod.rs

@@ -7,13 +7,9 @@
 
 mod dimensions;
 mod flat_theme;
-#[cfg(feature = "stack_dst")]
-mod multi_theme;
 mod shaded_theme;
 
 pub(crate) use dimensions::{Dimensions, DimensionsParams, DimensionsWindow};
 
 pub use flat_theme::FlatTheme;
-#[cfg(feature = "stack_dst")]
-pub use multi_theme::MultiTheme;
 pub use shaded_theme::ShadedTheme;

src/lib.rs

@@ -20,6 +20,7 @@
 
 #![cfg_attr(feature = "nightly", feature(new_uninit))]
 #![cfg_attr(feature = "gat", feature(generic_associated_types))]
+#![feature(unsize)]
 
 #[cfg(all(feature = "gat", feature = "stack_dst"))]
 compile_error!("Crate features 'gat' and 'stack_dst' are incompatible.");

src/theme/mod.rs

@@ -20,11 +20,15 @@
 
 use kas::Align;
 
+#[cfg(all(feature = "stack_dst", not(feature = "gat")))]
+mod multi_theme;
 #[cfg(all(feature = "stack_dst", not(feature = "gat")))]
 mod theme_dst;
 mod theme_handle;
 mod theme_traits;
 
+#[cfg(all(feature = "stack_dst", not(feature = "gat")))]
+pub use multi_theme::MultiTheme;
 #[cfg(all(feature = "stack_dst", not(feature = "gat")))]
 pub use theme_dst::{StackDst, ThemeDst, WindowDst};
 pub use theme_handle::{DrawHandle, SizeHandle};

kas-wgpu/src/theme/multi_theme.rs renamed to src/theme/multi_theme.rs

@@ -5,47 +5,42 @@
 
 //! Wrapper around mutliple themes, supporting run-time switching
 
+use rusttype::Font;
 use std::collections::HashMap;
 use std::marker::Unsize;
-use wgpu_glyph::Font;
 
 use kas::draw::Colour;
 use kas::geom::Rect;
 use kas::theme::{self, StackDst, Theme, ThemeAction, ThemeApi, ThemeDst};
 
-use crate::draw::DrawPipe;
-
-/// Supported theme type
-type DynTheme = dyn ThemeDst<DrawPipe>;
-
 /// Wrapper around mutliple themes, supporting run-time switching
-pub struct MultiTheme {
+pub struct MultiTheme<Draw> {
     names: HashMap<String, usize>,
-    themes: Vec<StackDst<DynTheme>>,
+    themes: Vec<StackDst<dyn ThemeDst<Draw>>>,
     active: usize,
 }
 
-pub struct MultiThemeBuilder {
+pub struct MultiThemeBuilder<Draw> {
     names: HashMap<String, usize>,
-    themes: Vec<StackDst<DynTheme>>,
+    themes: Vec<StackDst<dyn ThemeDst<Draw>>>,
 }
 
-impl MultiTheme {
+impl<Draw> MultiTheme<Draw> {
     /// Construct with builder pattern
-    pub fn builder() -> MultiThemeBuilder {
+    pub fn builder() -> MultiThemeBuilder<Draw> {
         MultiThemeBuilder {
             names: HashMap::new(),
             themes: vec![],
         }
     }
 }
 
-impl MultiThemeBuilder {
+impl<Draw> MultiThemeBuilder<Draw> {
     /// Add a theme
     pub fn add<S: ToString, U>(mut self, name: S, theme: U) -> Self
     where
-        U: Unsize<DynTheme>,
-        Box<U>: Unsize<DynTheme>,
+        U: Unsize<dyn ThemeDst<Draw>>,
+        Box<U>: Unsize<dyn ThemeDst<Draw>>,
     {
         let index = self.themes.len();
         self.names.insert(name.to_string(), index);
@@ -56,7 +51,7 @@ impl MultiThemeBuilder {
     /// Build
     ///
     /// Fails if no themes were added.
-    pub fn try_build(self) -> Result<MultiTheme, ()> {
+    pub fn try_build(self) -> Result<MultiTheme<Draw>, ()> {
         if self.themes.len() == 0 {
             return Err(());
         }
@@ -70,17 +65,17 @@ impl MultiThemeBuilder {
     /// Build
     ///
     /// Panics if no themes were added.
-    pub fn build(self) -> MultiTheme {
+    pub fn build(self) -> MultiTheme<Draw> {
         self.try_build()
             .unwrap_or_else(|_| panic!("MultiThemeBuilder: no themes added"))
     }
 }
 
-impl Theme<DrawPipe> for MultiTheme {
-    type Window = StackDst<dyn theme::WindowDst<DrawPipe>>;
+impl<Draw: 'static> Theme<Draw> for MultiTheme<Draw> {
+    type Window = StackDst<dyn theme::WindowDst<Draw>>;
     type DrawHandle = StackDst<dyn theme::DrawHandle>;
 
-    fn new_window(&self, draw: &mut DrawPipe, dpi_factor: f32) -> Self::Window {
+    fn new_window(&self, draw: &mut Draw, dpi_factor: f32) -> Self::Window {
         self.themes[self.active].new_window(draw, dpi_factor)
     }
 
@@ -90,7 +85,7 @@ impl Theme<DrawPipe> for MultiTheme {
 
     unsafe fn draw_handle<'a>(
         &'a self,
-        draw: &'a mut DrawPipe,
+        draw: &'a mut Draw,
         window: &'a mut Self::Window,
         rect: Rect,
     ) -> StackDst<dyn theme::DrawHandle> {
@@ -110,7 +105,7 @@ impl Theme<DrawPipe> for MultiTheme {
     }
 }
 
-impl ThemeApi for MultiTheme {
+impl<Draw> ThemeApi for MultiTheme<Draw> {
     fn set_font_size(&mut self, size: f32) -> ThemeAction {
         // Slightly inefficient, but sufficient: update both
         // (Otherwise we would have to call set_colours in set_theme too.)

src/theme/theme_traits.rs

@@ -5,11 +5,10 @@
 
 //! Theme traits
 
+use rusttype::Font;
 use std::any::Any;
 use std::ops::{Deref, DerefMut};
 
-use rusttype::Font;
-
 use super::{DrawHandle, SizeHandle, ThemeAction};
 use kas::draw::Colour;
 use kas::geom::Rect;