From 700262e05c76e003158acfeb8edd9f6b026d78cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 24 Feb 2023 13:56:37 +0100
Subject: [PATCH] Fix `checkbox` example

---
 examples/checkbox/fonts/icons.ttf | Bin 1272 -> 1784 bytes
 examples/checkbox/src/main.rs     |  28 +++++++++++++++++++---------
 native/src/widget/checkbox.rs     |   2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/examples/checkbox/fonts/icons.ttf b/examples/checkbox/fonts/icons.ttf
index a20468447859c36c31b597f00325c92d501ba46f..82f284819e03ac896cb04aac5a05b04100a3d669 100644
GIT binary patch
literal 1784
zcmZQzWME+6WoTevW(aU|3-MjR{fUQxf$a_h1A~mai>n)hI)elQ1KS=31_lNHV0|Ng
zA=Whv42%&B3=9d$xrqhrg_qtiFfd+WU|>v1Pb@BAU|<knU|`$Az`($fo>Q4-sZbop
zz`*Rmz`&@Hk(!vI^s6SFfq?;JzF9^_Y9f0s^Kk|SMiB-E29=E5k_zrs3<(Sjj5`<@
z7^HIYlM@*-7`8AlFk67k%}uN*VBlm>XJB9i@fGqCb5m!}{Km<^z*4}#!1$>kzqo{Z
zS9Jjc16v9M1497VZww3!qP|>m@%%Pl8Ms*(K;VJ!wP|2lE-@2CGp}aO2Dz7k3B+Sy
z0O?~s@c#e<14KRZYLEz24nnbkMc5fs!88M0Cqx!RGBY<YPGDeVU|^cbbcTU}p&vps
zzGg6H<OC@|!i)k)95B;?f#D@1*bNTM2N)b6ZUW1I2n7a4h|3rl7(+n<5C^a@FeETQ
z_{<Cp3?M86bzd9<GnggAz{23fz`(%8z`?-8z{J4FpzxCM|KI=r!KNs@WPq^$KLPU@
z8Mwe|dBFBFGq5tSfy5cv7#J8qrh|k*VFtn=2^eOCg&a&^n9>{!91H>s5)1(hQ^27M
z@g@@kgC!_rAv|!@VC5$;I500@c3_ZaU|>{JS5snV<7ZTdFxc7H*+j&}#5ozw%*{;H
z)tF=C)Ybge)#S|0K@2rDc_l$XK|v+P7{(Ydi<wbgKtMo1-qKQmUqFCgL0MNfR#!*m
z-!#T72$O-4A(TM~oYGYo7=%H_b274t$TNx=nR7CV8QC+MnW%FznwjV`swuH^f`|=1
z{QQip|9<oHd-3TCGO{tU@#_eB@$>)t&BzK7`}gbLFMb_<<`^G-T|p3sPZy*Bs)=7m
zkdYHr6F5i&7>=QY7N`UQ<vCUceyBJT10rWJGbl0?Ld97aSQ+L+*{lrQ411w$HU?IP
zt57x<gA}76D7CY|av3uNBMT=3C@nKX#hDoR7(}6LW(Fq)T_~G{fs0`>l+DT@#;_F1
zW@F%DI0<EQF_<vi2KghCA(<hcA&;S$fgv+FKd+d9A&4QBA)TR=A%`K6p@@MYC^fw_
zC$Wfu!40gg1WXq(q%)*4C@>f?=rI^DC@@$tC@>&Qg7A$POc-<-jKJ7{!HB__fx#_5
zuf#3CC_PodNY6mQN&#%6f|Y`iiLQ~Zk%5sh1Cl8)_k=N|G88csGh~A8S70y%+sP1?
zT2!2wpQm7`XMjx?%(V(&m*#=ZNMtBsNM%T2P+&-6sAN!J@C5tammwc)vL3{J3hAkN
zsYQt;sVNFcl?tB8`M&x2d3vCrLN6acV#t`Cfq{{Ufr*isftitok(IqPFVn!lzyL}c
zf@oJu2;bGxz>tBFf${%;XlenKO`tpovIA5of@n~R0%1_9Vqjpne{&Z|6$5g)4*+x`
B*d+h}

delta 853
zcmeyt`-8KdfsuiMft#U$ftkU;KUm+0Ux>AVfq`KU0|P@sa&BUQc-W;51_nkM1_p+Z
z^u*!<1_lNJ1_nkD&5@o{nPwx9$IQUMSi!)+Xp)hdn4<LHV=Ds#(;5Z_2D6Ne)I|0;
z=Hm<uOivgX7*sNHODgyn7_KrfFmo_4Fi7O&Cp#uG9Ad~~U|?2YU|`_OO{^$j;9yW^
zU|=?2U|>+lOUzB3>Bae*fq^-Ifq}8DAiubTfti7Ufq~@)NS=Y2IdpOiW3(bj2qX@|
zG7OAhH8Kp$V9&`gurOFm{=%qO&-nkbI15x1qyvN*85sZnXW$2`1o0Udm>3w$EkU6|
zf><Gg19LyK0fRgP1EZR{ni4x3KchN?!Oq6cCL%5-&dE4=0kb!I3WFl^9OjtGpP1{l
z!Im&ET$$b@8qaU@m4TZD?1Bfv*QS9OFdD3$gHhIT4w8#N3K$sJAUYr%CQ!IAFch*d
zFr<J*xEMqj<QT#jW-%~;b+S#iW0bCEVBlj|2j+uB*`abEf3q_rK*gCE*cr^AY!(J~
zhEgb-m4TZ<6v}2}U}x}#vbh+f7`i|q%fiXP$iT<I4rMbj@G+!A*~|=l47Lo+^$d(G
zoD3`sd<->E304L%1_daaje(CL2+HPSFkx7dnVg@SpP$E&$&k#D&ydTI&ydfM7nWL7
zoSC1eV5n!n5XO+oP{dHokO`7tP+%}*&|@&bstY0*jAm9)YI<o-Vi7|SLn=c$Ln%WJ
xLn1>FL@Am|xBR>kh4j?C)S|?a)D(rJN(Im4eBb>1JiW<+Y-UUh%##zD<N$I_f6V{@

diff --git a/examples/checkbox/src/main.rs b/examples/checkbox/src/main.rs
index 09950bb8..77111490 100644
--- a/examples/checkbox/src/main.rs
+++ b/examples/checkbox/src/main.rs
@@ -1,10 +1,9 @@
+use iced::executor;
+use iced::font::{self, Font};
 use iced::widget::{checkbox, column, container};
-use iced::{Element, Font, Length, Sandbox, Settings};
+use iced::{Application, Command, Element, Length, Settings, Theme};
 
-const ICON_FONT: Font = Font::External {
-    name: "Icons",
-    bytes: include_bytes!("../fonts/icons.ttf"),
-};
+const ICON_FONT: Font = Font::Name("icons");
 
 pub fn main() -> iced::Result {
     Example::run(Settings::default())
@@ -20,24 +19,35 @@ struct Example {
 enum Message {
     DefaultChecked(bool),
     CustomChecked(bool),
+    FontLoaded(Result<(), font::Error>),
 }
 
-impl Sandbox for Example {
+impl Application for Example {
     type Message = Message;
+    type Flags = ();
+    type Executor = executor::Default;
+    type Theme = Theme;
 
-    fn new() -> Self {
-        Default::default()
+    fn new(_flags: Self::Flags) -> (Self, Command<Message>) {
+        (
+            Self::default(),
+            font::load(include_bytes!("../fonts/icons.ttf").as_ref())
+                .map(Message::FontLoaded),
+        )
     }
 
     fn title(&self) -> String {
         String::from("Checkbox - Iced")
     }
 
-    fn update(&mut self, message: Message) {
+    fn update(&mut self, message: Message) -> Command<Message> {
         match message {
             Message::DefaultChecked(value) => self.default_checkbox = value,
             Message::CustomChecked(value) => self.custom_checkbox = value,
+            Message::FontLoaded(_) => (),
         }
+
+        Command::none()
     }
 
     fn view(&self) -> Element<Message> {
diff --git a/native/src/widget/checkbox.rs b/native/src/widget/checkbox.rs
index 0e21e995..6ba06d3b 100644
--- a/native/src/widget/checkbox.rs
+++ b/native/src/widget/checkbox.rs
@@ -267,7 +267,7 @@ where
                 code_point,
                 size,
             } = &self.icon;
-            let size = size.map(f32::from).unwrap_or(bounds.height * 0.7);
+            let size = size.unwrap_or(bounds.height * 0.7);
 
             if self.is_checked {
                 renderer.fill_text(text::Text {