Rename Variant to Style and Style to Appearance

native/src/widget/button.rs

@@ -12,7 +12,7 @@ use crate::{
     Rectangle, Shell, Vector, Widget,
 };
 
-pub use iced_style::button::{Style, StyleSheet};
+pub use iced_style::button::{Appearance, StyleSheet};
 
 /// A generic widget that produces a message when pressed.
 ///
@@ -66,7 +66,7 @@ where
     width: Length,
     height: Length,
     padding: Padding,
-    variant: <Renderer::Theme as StyleSheet>::Variant,
+    style: <Renderer::Theme as StyleSheet>::Style,
 }
 
 impl<'a, Message, Renderer> Button<'a, Message, Renderer>
@@ -74,7 +74,6 @@ where
     Message: Clone,
     Renderer: crate::Renderer,
     Renderer::Theme: StyleSheet,
-    <Renderer::Theme as StyleSheet>::Variant: Default,
 {
     /// Creates a new [`Button`] with some local [`State`] and the given
     /// content.
@@ -89,7 +88,7 @@ where
             width: Length::Shrink,
             height: Length::Shrink,
             padding: Padding::new(5),
-            variant: <Renderer::Theme as StyleSheet>::Variant::default(),
+            style: Default::default(),
         }
     }
 
@@ -118,12 +117,12 @@ where
         self
     }
 
-    /// Sets the style variant of this [`Button`].
+    /// Sets the style of this [`Button`].
     pub fn style(
         mut self,
-        variant: <Renderer::Theme as StyleSheet>::Variant,
+        style: <Renderer::Theme as StyleSheet>::Style,
     ) -> Self {
-        self.variant = variant;
+        self.style = style;
         self
     }
 }
@@ -196,29 +195,34 @@ pub fn update<'a, Message: Clone>(
 }
 
 /// Draws a [`Button`].
-pub fn draw<'a, Renderer: crate::Renderer, Variant>(
+pub fn draw<'a, Renderer: crate::Renderer>(
     renderer: &mut Renderer,
     bounds: Rectangle,
     cursor_position: Point,
     is_enabled: bool,
-    style_sheet: &dyn StyleSheet<Variant = Variant>,
-    variation: Variant,
+    style_sheet: &dyn StyleSheet<
+        Style = <Renderer::Theme as StyleSheet>::Style,
+    >,
+    style: <Renderer::Theme as StyleSheet>::Style,
     state: impl FnOnce() -> &'a State,
-) -> Style {
+) -> Appearance
+where
+    Renderer::Theme: StyleSheet,
+{
     let is_mouse_over = bounds.contains(cursor_position);
 
     let styling = if !is_enabled {
-        style_sheet.disabled(variation)
+        style_sheet.disabled(style)
     } else if is_mouse_over {
         let state = state();
 
         if state.is_pressed {
-            style_sheet.pressed(variation)
+            style_sheet.pressed(style)
         } else {
-            style_sheet.hovered(variation)
+            style_sheet.hovered(style)
         }
     } else {
-        style_sheet.active(variation)
+        style_sheet.active(style)
     };
 
     if styling.background.is_some() || styling.border_width > 0.0 {
@@ -295,7 +299,6 @@ where
     Message: Clone,
     Renderer: crate::Renderer,
     Renderer::Theme: StyleSheet,
-    <Renderer::Theme as StyleSheet>::Variant: Copy,
 {
     fn width(&self) -> Length {
         self.width
@@ -378,7 +381,7 @@ where
             cursor_position,
             self.on_press.is_some(),
             theme,
-            self.variant,
+            self.style,
             || &self.state,
         );
 
@@ -410,7 +413,6 @@ where
     Message: 'a + Clone,
     Renderer: 'a + crate::Renderer,
     Renderer::Theme: StyleSheet,
-    <Renderer::Theme as StyleSheet>::Variant: Copy,
 {
     fn from(
         button: Button<'a, Message, Renderer>,

native/src/widget/slider.rs

@@ -13,7 +13,7 @@ use crate::{
 
 use std::ops::RangeInclusive;
 
-pub use iced_style::slider::{Handle, HandleShape, Style, StyleSheet};
+pub use iced_style::slider::{Appearance, Handle, HandleShape, StyleSheet};
 
 /// An horizontal bar and a handle that selects a single value from a range of
 /// values.
@@ -53,7 +53,7 @@ where
     on_release: Option<Message>,
     width: Length,
     height: u16,
-    variant: <Renderer::Theme as StyleSheet>::Variant,
+    style: <Renderer::Theme as StyleSheet>::Style,
 }
 
 impl<'a, T, Message, Renderer> Slider<'a, T, Message, Renderer>
@@ -105,7 +105,7 @@ where
             on_release: None,
             width: Length::Fill,
             height: Self::DEFAULT_HEIGHT,
-            variant: Default::default(),
+            style: Default::default(),
         }
     }
 
@@ -135,9 +135,9 @@ where
     /// Sets the style of the [`Slider`].
     pub fn style(
         mut self,
-        variant: impl Into<<Renderer::Theme as StyleSheet>::Variant>,
+        style: impl Into<<Renderer::Theme as StyleSheet>::Style>,
     ) -> Self {
-        self.variant = variant.into();
+        self.style = style.into();
         self
     }
 
@@ -243,8 +243,8 @@ pub fn draw<T, R>(
     state: &State,
     value: T,
     range: &RangeInclusive<T>,
-    style_sheet: &dyn StyleSheet<Variant = <R::Theme as StyleSheet>::Variant>,
-    variant: <R::Theme as StyleSheet>::Variant,
+    style_sheet: &dyn StyleSheet<Style = <R::Theme as StyleSheet>::Style>,
+    style: <R::Theme as StyleSheet>::Style,
 ) where
     T: Into<f64> + Copy,
     R: crate::Renderer,
@@ -254,11 +254,11 @@ pub fn draw<T, R>(
     let is_mouse_over = bounds.contains(cursor_position);
 
     let style = if state.is_dragging {
-        style_sheet.dragging(variant)
+        style_sheet.dragging(style)
     } else if is_mouse_over {
-        style_sheet.hovered(variant)
+        style_sheet.hovered(style)
     } else {
-        style_sheet.active(variant)
+        style_sheet.active(style)
     };
 
     let rail_y = bounds.y + (bounds.height / 2.0).round();
@@ -434,7 +434,7 @@ where
             self.value,
             &self.range,
             theme,
-            self.variant,
+            self.style,
         )
     }