From 692216042307c0ff0d792d1bba6928e499a65d1f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 18 Feb 2020 02:28:15 +0100
Subject: Pull `Checkbox` default constants from its `Renderer`

---
 wgpu/src/renderer/widget/checkbox.rs | 7 ++-----
 wgpu/src/renderer/widget/text.rs     | 7 +------
 2 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'wgpu/src/renderer/widget')

diff --git a/wgpu/src/renderer/widget/checkbox.rs b/wgpu/src/renderer/widget/checkbox.rs
index 17121eea..1a0585d3 100644
--- a/wgpu/src/renderer/widget/checkbox.rs
+++ b/wgpu/src/renderer/widget/checkbox.rs
@@ -3,14 +3,11 @@ use iced_native::{
     checkbox, HorizontalAlignment, MouseCursor, Rectangle, VerticalAlignment,
 };
 
-const SIZE: f32 = 28.0;
-
 impl checkbox::Renderer for Renderer {
     type Style = Box<dyn StyleSheet>;
 
-    fn default_size(&self) -> u32 {
-        SIZE as u32
-    }
+    const DEFAULT_SIZE: u16 = 20;
+    const DEFAULT_SPACING: u16 = 15;
 
     fn draw(
         &mut self,
diff --git a/wgpu/src/renderer/widget/text.rs b/wgpu/src/renderer/widget/text.rs
index d61c5523..33e549cd 100644
--- a/wgpu/src/renderer/widget/text.rs
+++ b/wgpu/src/renderer/widget/text.rs
@@ -6,13 +6,8 @@ use iced_native::{
 
 use std::f32;
 
-// TODO: Obtain from renderer configuration
-const DEFAULT_TEXT_SIZE: f32 = 20.0;
-
 impl text::Renderer for Renderer {
-    fn default_size(&self) -> u16 {
-        DEFAULT_TEXT_SIZE as u16
-    }
+    const DEFAULT_SIZE: u16 = 20;
 
     fn measure(
         &self,
-- 
cgit