more styles

src/lib.rs

@@ -9,6 +9,7 @@ pub mod animation;
 pub mod context;
 mod graphics;
 mod names;
+#[macro_use]
 pub mod styles;
 mod tick;
 mod tree;

src/styles.rs

@@ -22,6 +22,7 @@ use crate::styles::components::{FocusableWidgets, VisualOrder};
 use crate::utils::Lazy;
 use crate::value::{Dynamic, IntoValue, Value};
 
+#[macro_use]
 pub mod components;
 
 /// A collection of style components organized by their name.

src/styles/components.rs

@@ -12,6 +12,51 @@ use crate::styles::{
     Component, ComponentDefinition, ComponentName, Dimension, Global, NamedComponent,
 };
 
+macro_rules! define_components {
+    ($($widget:ident { $($(#$doc:tt)* $component:ident($type:ty, $name:expr, $($default:tt)*))* })*) => {$($(
+        $(#$doc)*
+        #[derive(Clone, Copy, Eq, PartialEq, Debug)]
+        pub struct $component;
+
+        const _: () = {
+            use $crate::styles::{ComponentDefinition, ComponentName, NamedComponent};
+            impl NamedComponent for $component {
+                fn name(&self) -> Cow<'_, ComponentName> {
+                    Cow::Owned(ComponentName::named::<Button>($name))
+                }
+            }
+
+            impl ComponentDefinition for $component {
+                type ComponentType = $type;
+                
+                define_components!($type, $($default)*);
+            }
+        };
+
+    )*)*};
+    ($type:ty, . $($path:tt)*) => {
+        define_components!($type, |context| context.theme().$($path)*);
+    };
+    ($type:ty, |$context:ident| $($expr:tt)*) => {
+        fn default_value(&self, $context: &WidgetContext<'_, '_>) -> Color {
+            $($expr)*
+        }
+    };
+    ($type:ty, @$path:path) => {
+        define_components!($type, |context| context.query_style(&$path));
+    };
+    ($type:ty, contrasting!($bg:ident, $($fg:ident),+ $(,)?)) => {
+        define_components!($type, |context| {
+            context.query_style(&$bg).most_contrasting(&[
+                $(context.query_style(&$fg)),+
+            ])
+        });
+    };
+    ($type:ty, $($expr:tt)*) => {
+        define_components!($type, |_context| $($expr)*);
+    };
+}
+
 /// The [`Dimension`] to use as the size to render text.
 #[derive(Clone, Copy, Eq, PartialEq, Debug)]
 pub struct TextSize;

src/widgets/button.rs

@@ -14,9 +14,7 @@ use crate::names::Name;
 use crate::styles::components::{
     AutoFocusableControls, Easing, IntrinsicPadding, SurfaceColor, TextColor,
 };
-use crate::styles::{
-    ColorExt, ComponentDefinition, ComponentGroup, ComponentName, NamedComponent, Styles,
-};
+use crate::styles::{ColorExt, ComponentGroup, Styles};
 use crate::utils::ModifiersExt;
 use crate::value::{Dynamic, IntoValue, Value};
 use crate::widget::{Callback, EventHandling, MakeWidget, Widget, WidgetRef, HANDLED, IGNORED};
@@ -86,47 +84,37 @@ impl Button {
             &ButtonBackground,
             &ButtonHoverBackground,
             &ButtonDisabledBackground,
+            &ButtonActiveForeground,
+            &ButtonForeground,
+            &ButtonHoverForeground,
+            &ButtonDisabledForeground,
             &Easing,
-            &TextColor,
-            &SurfaceColor,
         ]);
-        let text_color = styles.get(&TextColor, context);
-        let surface_color = styles.get(&SurfaceColor, context);
-        let (background_color, text_color, surface_color) = if !self.enabled.get() {
-            (
+
+        let (background_color, text_color) = match () {
+            () if !self.enabled.get() => (
                 styles.get(&ButtonDisabledBackground, context),
-                text_color,
-                surface_color,
-            )
-        } else if context.is_default() {
-            // TODO this probably should be de-prioritized if ButtonBackground is explicitly set.
-            (
+                styles.get(&ButtonDisabledForeground, context),
+            ),
+            // TODO this probably should use actual style.
+            () if context.is_default() => (
                 context.theme().primary.color,
                 context.theme().primary.on_color,
-                context.theme().primary.color,
-            )
-        } else if context.active() {
-            (
+            ),
+            () if context.active() => (
                 styles.get(&ButtonActiveBackground, context),
-                text_color,
-                surface_color,
-            )
-        } else if context.hovered() {
-            (
+                styles.get(&ButtonActiveForeground, context),
+            ),
+            () if context.hovered() => (
                 styles.get(&ButtonHoverBackground, context),
-                text_color,
-                surface_color,
-            )
-        } else {
-            (
+                styles.get(&ButtonHoverForeground, context),
+            ),
+            () => (
                 styles.get(&ButtonBackground, context),
-                text_color,
-                surface_color,
-            )
+                styles.get(&ButtonForeground, context),
+            ),
         };
 
-        let text_color = background_color.most_contrasting(&[text_color, surface_color]);
-
         match (immediate, &self.background_color, &self.text_color) {
             (false, Some(bg), Some(text)) => {
                 self.color_animation = (
@@ -332,76 +320,27 @@ impl ComponentGroup for Button {
     }
 }
 
-/// The background color of the button.
-#[derive(Clone, Copy, Eq, PartialEq, Debug)]
-pub struct ButtonBackground;
-
-impl NamedComponent for ButtonBackground {
-    fn name(&self) -> Cow<'_, ComponentName> {
-        Cow::Owned(ComponentName::named::<Button>("background_color"))
-    }
-}
-
-impl ComponentDefinition for ButtonBackground {
-    type ComponentType = Color;
-
-    fn default_value(&self, context: &WidgetContext<'_, '_>) -> Color {
-        context.theme().surface.color
-    }
-}
-
-/// The background color of the button when it is active (depressed).
-#[derive(Clone, Copy, Eq, PartialEq, Debug)]
-pub struct ButtonActiveBackground;
-
-impl NamedComponent for ButtonActiveBackground {
-    fn name(&self) -> Cow<'_, ComponentName> {
-        Cow::Owned(ComponentName::named::<Button>("active_background_color"))
-    }
-}
-
-impl ComponentDefinition for ButtonActiveBackground {
-    type ComponentType = Color;
-
-    fn default_value(&self, context: &WidgetContext<'_, '_>) -> Color {
-        context.theme().surface.dim_color
-    }
-}
-
-/// The background color of the button when the mouse cursor is hovering over
-/// it.
-#[derive(Clone, Copy, Eq, PartialEq, Debug)]
-pub struct ButtonHoverBackground;
-
-impl NamedComponent for ButtonHoverBackground {
-    fn name(&self) -> Cow<'_, ComponentName> {
-        Cow::Owned(ComponentName::named::<Button>("hover_background_color"))
-    }
-}
-
-impl ComponentDefinition for ButtonHoverBackground {
-    type ComponentType = Color;
-
-    fn default_value(&self, context: &WidgetContext<'_, '_>) -> Color {
-        context.theme().surface.bright_color
-    }
-}
-
-/// The background color of the button when the mouse cursor is hovering over
-/// it.
-#[derive(Clone, Copy, Eq, PartialEq, Debug)]
-pub struct ButtonDisabledBackground;
-
-impl NamedComponent for ButtonDisabledBackground {
-    fn name(&self) -> Cow<'_, ComponentName> {
-        Cow::Owned(ComponentName::named::<Button>("disabled_background_color"))
-    }
-}
-
-impl ComponentDefinition for ButtonDisabledBackground {
-    type ComponentType = Color;
-
-    fn default_value(&self, context: &WidgetContext<'_, '_>) -> Color {
-        context.theme().surface.dim_color
+define_components! {
+    Button {
+        /// The background color of the button.
+        ButtonBackground(Color, "background_color", .surface.color)
+        /// The background color of the button when it is active (depressed).
+        ButtonActiveBackground(Color, "active_background_color", .surface.dim_color)
+        /// The background color of the button when the mouse cursor is hovering over
+        /// it.
+        ButtonHoverBackground(Color, "hover_background_color", .surface.bright_color)
+        /// The background color of the button when the mouse cursor is hovering over
+        /// it.
+        ButtonDisabledBackground(Color, "disabled_background_color", .surface.dim_color)
+        /// The foreground color of the button.
+        ButtonForeground(Color, "foreground_color", contrasting!(ButtonBackground, TextColor, SurfaceColor))
+        /// The foreground color of the button when it is active (depressed).
+        ButtonActiveForeground(Color, "active_foreground_color", contrasting!(ButtonActiveBackground, ButtonForeground, SurfaceColor))
+        /// The foreground color of the button when the mouse cursor is hovering over
+        /// it.
+        ButtonHoverForeground(Color, "hover_foreground_color", contrasting!(ButtonHoverBackground, ButtonForeground, SurfaceColor))
+        /// The foreground color of the button when the mouse cursor is hovering over
+        /// it.
+        ButtonDisabledForeground(Color, "disabled_foreground_color", contrasting!(ButtonDisabledBackground, ButtonForeground, SurfaceColor))
     }
 }