From 8caa66be2708b1c83e20d905d69902c2567c4692 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 30 Dec 2019 12:14:26 +0100
Subject: Add `Renderer::Defaults` and style inheritance

---
 native/src/widget/text.rs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'native/src/widget/text.rs')

diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs
index cf9c9565..3a3db3cd 100644
--- a/native/src/widget/text.rs
+++ b/native/src/widget/text.rs
@@ -146,10 +146,12 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
+        defaults: &Renderer::Defaults,
         layout: Layout<'_>,
         _cursor_position: Point,
     ) -> Renderer::Output {
         renderer.draw(
+            defaults,
             layout.bounds(),
             &self.content,
             self.size.unwrap_or(renderer.default_size()),
@@ -209,6 +211,7 @@ pub trait Renderer: crate::Renderer {
     /// [`VerticalAlignment`]: enum.VerticalAlignment.html
     fn draw(
         &mut self,
+        defaults: &Self::Defaults,
         bounds: Rectangle,
         content: &str,
         size: u16,
-- 
cgit 


From 2ff0e48142c302cb93130164d083589bb2ac4979 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 30 Dec 2019 20:54:04 +0100
Subject: Make `Row`, `Column`, and `Checkbox` shrink by default

---
 native/src/widget/text.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'native/src/widget/text.rs')

diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs
index cf9c9565..caa81db0 100644
--- a/native/src/widget/text.rs
+++ b/native/src/widget/text.rs
@@ -41,7 +41,7 @@ impl Text {
             size: None,
             color: None,
             font: Font::Default,
-            width: Length::Fill,
+            width: Length::Shrink,
             height: Length::Shrink,
             horizontal_alignment: HorizontalAlignment::Left,
             vertical_alignment: VerticalAlignment::Top,
-- 
cgit