From 2bd610cb5bd2d6ad3ac4350dd84cdd4937eba162 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emilernerfeldt@gmail.com>
Date: Fri, 8 May 2020 22:48:08 +0200
Subject: [PATCH] Fix dubplicate itmes in Style menu

---
 emigui/src/style.rs | 17 ++++-------------
 emigui/src/ui.rs    |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/emigui/src/style.rs b/emigui/src/style.rs
index 59e91efc..bf03556d 100644
--- a/emigui/src/style.rs
+++ b/emigui/src/style.rs
@@ -44,7 +44,7 @@ pub struct Style {
 
     // -----------------------------------------------
     // Debug rendering:
-    pub debug_uis: bool,
+    pub debug_widget_rects: bool,
 }
 
 #[derive(Clone, Copy, Debug, Deserialize, Serialize)]
@@ -67,7 +67,7 @@ impl Default for Style {
             animation_time: 1.0 / 20.0,
             window: Window::default(),
             clip_rect_margin: 3.0,
-            debug_uis: false,
+            debug_widget_rects: false,
         }
     }
 }
@@ -165,15 +165,12 @@ impl Style {
 impl Style {
     #[rustfmt::skip]
     pub fn ui(&mut self, ui: &mut crate::Ui) {
-        use crate::{widgets::*, *};
+        use crate::{widgets::*};
         if ui.add(Button::new("Reset style")).clicked {
             *self = Default::default();
         }
 
-        ui.add(label!("Debug:").text_style(TextStyle::Heading));
-        ui.add(Checkbox::new(&mut self.debug_uis, "debug_uis"));
-        ui.add(Separator::new());
-        // TODO: ui.section("Heading", |ui| ui.add(contents))
+        ui.add(Checkbox::new(&mut self.debug_widget_rects, "Paint debug rectangles around widgets"));
 
         ui.add(Slider::f32(&mut self.item_spacing.x,     0.0..=10.0).text("item_spacing.x").precision(0));
         ui.add(Slider::f32(&mut self.item_spacing.y,     0.0..=10.0).text("item_spacing.y").precision(0));
@@ -186,11 +183,5 @@ impl Style {
         ui.add(Slider::f32(&mut self.start_icon_width,   0.0..=60.0).text("start_icon_width").precision(0));
         ui.add(Slider::f32(&mut self.line_width,         0.0..=10.0).text("line_width").precision(0));
         ui.add(Slider::f32(&mut self.animation_time,     0.0..=1.0).text("animation_time").precision(2));
-
-
-        // TODO: ui.section("Heading", |ui| ui.add(contents))
-        ui.add(Separator::new());
-        ui.add(label!("Debug:").text_style(TextStyle::Heading));
-        ui.add(Checkbox::new(&mut self.debug_uis, "debug_uis"));
     }
 }
diff --git a/emigui/src/ui.rs b/emigui/src/ui.rs
index 21ec13b9..bdae0ffc 100644
--- a/emigui/src/ui.rs
+++ b/emigui/src/ui.rs
@@ -323,7 +323,7 @@ impl Ui {
         let child_pos = self.reserve_space_impl(child_size);
         let rect = Rect::from_min_size(child_pos, child_size);
 
-        if self.style().debug_uis {
+        if self.style().debug_widget_rects {
             self.add_paint_cmd(PaintCmd::Rect {
                 rect,
                 corner_radius: 0.0,