From d1bcb4f9b4ad493aa22f9c4e2250df1f789af292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kav=C3=ADk?= Date: Sat, 14 Sep 2024 19:12:04 +0200 Subject: [PATCH] fmt --- frontend/src/controls_panel.rs | 2 +- frontend/src/header_panel.rs | 9 +++------ frontend/src/theme.rs | 16 ++++++++-------- frontend/src/waveform_panel.rs | 5 ++--- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/frontend/src/controls_panel.rs b/frontend/src/controls_panel.rs index 3fc8477..aa3a205 100644 --- a/frontend/src/controls_panel.rs +++ b/frontend/src/controls_panel.rs @@ -1,4 +1,4 @@ -use crate::{Filename, Layout, theme::*}; +use crate::{theme::*, Filename, Layout}; use std::cell::Cell; use std::mem; use std::ops::Not; diff --git a/frontend/src/header_panel.rs b/frontend/src/header_panel.rs index 08a5667..cb534bc 100644 --- a/frontend/src/header_panel.rs +++ b/frontend/src/header_panel.rs @@ -1,4 +1,4 @@ -use crate::{platform, script_bridge, Filename, Layout, theme::*}; +use crate::{platform, script_bridge, theme::*, Filename, Layout}; use std::sync::Arc; use zoon::*; @@ -85,8 +85,7 @@ impl HeaderPanel { Label::new() .s(Padding::new().x(20).y(10)) .s(Background::new().color_signal( - hovered_signal - .map_bool(|| COLOR_MEDIUM_SLATE_BLUE, || COLOR_SLATE_BLUE), + hovered_signal.map_bool(|| COLOR_MEDIUM_SLATE_BLUE, || COLOR_SLATE_BLUE), )) .s(Align::new().left()) .s(RoundedCorners::all(15)) @@ -226,9 +225,7 @@ impl HeaderPanel { .attr("spellcheck", "false") .style("resize", "vertical") }) - .placeholder( - Placeholder::new("FW.say_hello()").s(Font::new().color(COLOR_LIGHT_BLUE)), - ) + .placeholder(Placeholder::new("FW.say_hello()").s(Font::new().color(COLOR_LIGHT_BLUE))) .label_hidden("command editor panel") .text_signal(script_signal) .on_change(clone!((script, command_result) move |text| { diff --git a/frontend/src/theme.rs b/frontend/src/theme.rs index 93bd456..8d04a66 100644 --- a/frontend/src/theme.rs +++ b/frontend/src/theme.rs @@ -3,25 +3,25 @@ use zoon::*; // https://oklch.com/ // pub const COLOR_BLUE_VIOLET: Rgba = color!("BlueViolet"); // oklch(53.38% 0.25 301.37) -pub const COLOR_BLUE_VIOLET: Oklch = color!("oklch(53.38% 0.25 262.59)"); +pub const COLOR_BLUE_VIOLET: Oklch = color!("oklch(53.38% 0.25 262.59)"); // pub const COLOR_MEDIUM_SLATE_BLUE: Rgba = color!("MediumSlateBlue"); // oklch(60.45% 0.194 285.5) -pub const COLOR_MEDIUM_SLATE_BLUE: Oklch = color!("oklch(60.45% 0.194 262.26)"); +pub const COLOR_MEDIUM_SLATE_BLUE: Oklch = color!("oklch(60.45% 0.194 262.26)"); // pub const COLOR_SLATE_BLUE_WITH_ALPHA: Rgba = color!("SlateBlue", 0.8); // oklch(54.36% 0.171 285.54) pub const COLOR_SLATE_BLUE_WITH_ALPHA: Oklch = color!("oklch(54.36% 0.171 262.26)", 0.8); // pub const COLOR_SLATE_BLUE: Rgba = color!("SlateBlue"); // oklch(54.36% 0.171 285.54) -pub const COLOR_SLATE_BLUE: Oklch = color!("oklch(54.36% 0.171 262.26)"); +pub const COLOR_SLATE_BLUE: Oklch = color!("oklch(54.36% 0.171 262.26)"); -// pub const COLOR_LIGHT_BLUE: Rgba = color!("LightBlue"); // oklch(85.62% 0.049 219.65) -pub const COLOR_LIGHT_BLUE: Oklch = color!("oklch(85.62% 0.049 262.26)"); +// pub const COLOR_LIGHT_BLUE: Rgba = color!("LightBlue"); // oklch(85.62% 0.049 219.65) +pub const COLOR_LIGHT_BLUE: Oklch = color!("oklch(85.62% 0.049 262.26)"); // pub const COLOR_WHITE: Rgba = color!("White"); // oklch(100% 3.5594404384177905e-8 106.37411429114086) -pub const COLOR_WHITE: Oklch = color!("oklch(100% 3.5594404384177905e-8 105.88)"); +pub const COLOR_WHITE: Oklch = color!("oklch(100% 3.5594404384177905e-8 105.88)"); // pub const COLOR_DARK_SLATE_BLUE: Rgba = color!("DarkSlateBlue"); // oklch(41.43% 0.125 286.04) -pub const COLOR_DARK_SLATE_BLUE: Oklch = color!("oklch(41.43% 0.125 262.26)"); +pub const COLOR_DARK_SLATE_BLUE: Oklch = color!("oklch(41.43% 0.125 262.26)"); // pub const COLOR_LAVENDER: Rgba = color!("Lavender"); // oklch(93.09% 0.027 285.86) -pub const COLOR_LAVENDER: Oklch = color!("oklch(93.09% 0.027 262.26)"); +pub const COLOR_LAVENDER: Oklch = color!("oklch(93.09% 0.027 262.26)"); diff --git a/frontend/src/waveform_panel.rs b/frontend/src/waveform_panel.rs index 8d0bf58..6ec20af 100644 --- a/frontend/src/waveform_panel.rs +++ b/frontend/src/waveform_panel.rs @@ -1,4 +1,4 @@ -use crate::{platform, script_bridge, Filename, theme::*}; +use crate::{platform, script_bridge, theme::*, Filename}; use std::sync::Arc; use wellen::GetItem; use zoon::*; @@ -122,8 +122,7 @@ impl WaveformPanel { Label::new() .s(Padding::new().x(20).y(10)) .s(Background::new().color_signal( - hovered_signal - .map_bool(|| COLOR_MEDIUM_SLATE_BLUE, || COLOR_SLATE_BLUE), + hovered_signal.map_bool(|| COLOR_MEDIUM_SLATE_BLUE, || COLOR_SLATE_BLUE), )) .s(Align::new().left()) .s(RoundedCorners::all(15))