From 7467f6408e3b02adac9167d7bcd9647a036d88bd Mon Sep 17 00:00:00 2001
From: Roland Fredenhagen <dev@modprog.de>
Date: Mon, 13 Nov 2023 01:33:45 +0100
Subject: [PATCH] working outline

---
 examples/button.rs    | 13 ++++++++++++-
 src/widget.rs         | 12 ++++++++++++
 src/widgets/button.rs |  9 +++++----
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/examples/button.rs b/examples/button.rs
index a6ca0a2..b357da8 100644
--- a/examples/button.rs
+++ b/examples/button.rs
@@ -1,17 +1,28 @@
 use gooey::value::Dynamic;
+use gooey::widget::MakeWidget;
+use gooey::widgets::button::ButtonOutline;
 use gooey::widgets::Button;
 use gooey::Run;
+use kludgine::Color;
 
 fn main() -> gooey::Result {
     // begin rustme snippet: readme
     // Create a dynamic usize.
-    let count = Dynamic::new(0_usize);
+    let count = Dynamic::new(0_isize);
 
     // Create a new button with a label that is produced by mapping the contents
     // of `count`.
     Button::new(count.map_each(ToString::to_string))
         // Set the `on_click` callback to a closure that increments the counter.
         .on_click(count.with_clone(|count| move |_| count.set(count.get() + 1)))
+        .and(
+            // Creates a second, outlined button
+            Button::new(count.map_each(ToString::to_string))
+                // Set the `on_click` callback to a closure that decrements the counter.
+                .on_click(count.with_clone(|count| move |_| count.set(count.get() - 1)))
+                .with(&ButtonOutline, Color::DARKRED),
+        )
+        .in_columns()
         // Run the button as an an application.
         .run()
     // end rustme snippet
diff --git a/src/widget.rs b/src/widget.rs
index 0ead588..054a29d 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -1199,6 +1199,18 @@ impl Children {
         self
     }
 
+    /// Creates [`Stack::columns`] from self.
+    #[must_use]
+    pub fn in_columns(self) -> Stack {
+        Stack::columns(self)
+    }
+
+    /// Creates [`Stack::rows`] from self.
+    #[must_use]
+    pub fn in_rows(self) -> Stack {
+        Stack::rows(self)
+    }
+
     /// Returns the number of widgets in this list.
     #[must_use]
     pub fn len(&self) -> usize {
diff --git a/src/widgets/button.rs b/src/widgets/button.rs
index 055bc9b..7ff71ac 100644
--- a/src/widgets/button.rs
+++ b/src/widgets/button.rs
@@ -3,9 +3,10 @@ use std::panic::UnwindSafe;
 use std::time::Duration;
 
 use kludgine::app::winit::event::{DeviceId, ElementState, KeyEvent, MouseButton};
-use kludgine::figures::units::{Px, UPx};
+use kludgine::figures::units::{Px, UPx, Lp};
 use kludgine::figures::{IntoSigned, IntoUnsigned, Point, Rect, ScreenScale, Size};
 use kludgine::Color;
+use kludgine::shapes::StrokeOptions;
 
 use crate::animation::{AnimationHandle, AnimationTarget, LinearInterpolate, Spawn};
 use crate::context::{AsEventContext, EventContext, GraphicsContext, LayoutContext, WidgetContext};
@@ -137,7 +138,7 @@ impl Button {
         }
 
         let style = self.active_style.as_ref().expect("always initialized");
-        context.redraw_when_changed(&style);
+        context.redraw_when_changed(style);
         style.get()
     }
 }
@@ -158,7 +159,7 @@ impl Widget for Button {
         let style = self.current_style(context);
         context.gfx.fill(style.background);
 
-        // TODO draw outline
+        context.stroke_outline::<Lp>(style.outline, StrokeOptions::default());
 
         if context.focused() {
             context.draw_focus_ring();
@@ -331,7 +332,7 @@ define_components! {
         /// it.
         ButtonDisabledForeground(Color, "disabled_foreground_color", contrasting!(ButtonDisabledBackground, ButtonForeground, TextColor, SurfaceColor))
         /// The outline color of the button.
-        ButtonOutline(Color, "outline_color", contrasting!(ButtonBackground, TextColor, SurfaceColor))
+        ButtonOutline(Color, "outline_color", Color::CLEAR_BLACK)
         /// The outline color of the button when it is active (depressed).
         ButtonActiveOutline(Color, "active_outline_color", contrasting!(ButtonActiveBackground, ButtonOutline, TextColor, SurfaceColor))
         /// The outline color of the button when the mouse cursor is hovering over