From cce94676b60ab4a84fe390702ac0527d156de8b4 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emilernerfeldt@gmail.com>
Date: Tue, 12 May 2020 07:26:09 +0200
Subject: [PATCH] improve fractal clock

---
 emigui/src/examples/fractal_clock.rs | 37 +++++++++++++++-------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/emigui/src/examples/fractal_clock.rs b/emigui/src/examples/fractal_clock.rs
index c0c3da8a..de3f2413 100644
--- a/emigui/src/examples/fractal_clock.rs
+++ b/emigui/src/examples/fractal_clock.rs
@@ -44,30 +44,37 @@ impl FractalClock {
     }
 
     pub fn ui(&mut self, ui: &mut Ui) {
+        if !self.paused {
+            self.time = ui
+                .input()
+                .seconds_since_midnight
+                .unwrap_or_else(|| ui.input().time);
+        }
+
         self.fractal_ui(ui);
 
-        // TODO: background frame etc
-        Frame::popup(ui.style())
+        let frame = Frame::popup(ui.style())
             .fill_color(Some(color::gray(34, 160)))
-            .outline(None)
-            .show(&mut ui.left_column(320.0), |ui| self.options_ui(ui));
+            .outline(None);
+
+        frame.show(&mut ui.left_column(320.0), |ui| {
+            CollapsingHeader::new("Settings").show(ui, |ui| self.options_ui(ui));
+        });
     }
 
     fn options_ui(&mut self, ui: &mut Ui) {
-        let time = if let Some(seconds_since_midnight) = ui.input().seconds_since_midnight {
+        if ui.input().seconds_since_midnight.is_some() {
             ui.add(label!(
                 "Local time: {:02}:{:02}:{:02}.{:03}",
-                (seconds_since_midnight.rem_euclid(24.0 * 60.0 * 60.0) / 3600.0).floor(),
-                (seconds_since_midnight.rem_euclid(60.0 * 60.0) / 60.0).floor(),
-                (seconds_since_midnight.rem_euclid(60.0)).floor(),
-                (seconds_since_midnight.rem_euclid(1.0) * 1000.0).floor()
+                (self.time.rem_euclid(24.0 * 60.0 * 60.0) / 3600.0).floor(),
+                (self.time.rem_euclid(60.0 * 60.0) / 60.0).floor(),
+                (self.time.rem_euclid(60.0)).floor(),
+                (self.time.rem_euclid(1.0) * 1000.0).floor()
             ));
-            seconds_since_midnight
         } else {
             ui.add(label!(
                 "The fractal_clock clock is not showing the correct time"
             ));
-            ui.input().time
         };
 
         ui.add(Checkbox::new(&mut self.paused, "Paused"));
@@ -81,10 +88,6 @@ impl FractalClock {
             *self = Default::default();
         }
 
-        if !self.paused {
-            self.time = time;
-        }
-
         ui.add(
             Hyperlink::new("http://www.dqd.com/~mayoff/programs/FractalClock/")
                 .text("Inspired by a screensaver by Rob Mayoff"),
@@ -133,8 +136,8 @@ impl FractalClock {
         };
 
         let hand_rotations = [
-            hands[0].angle - hands[2].angle,
-            hands[1].angle - hands[2].angle,
+            hands[0].angle - hands[2].angle + TAU / 2.0,
+            hands[1].angle - hands[2].angle + TAU / 2.0,
         ];
 
         let hand_rotors = [