From ca34a5876046e35afa00dcbfe7bddafce94ebbf4 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Sun, 5 Jul 2020 20:45:19 -0700 Subject: [PATCH] fmt --- src/lib.rs | 18 ++++++++---------- src/widget_builders/button.rs | 2 +- src/widget_builders/grid.rs | 2 +- src/widget_builders/image.rs | 4 ++-- src/widget_builders/import.rs | 2 +- src/widget_builders/mod.rs | 10 +++++----- src/widget_builders/rectangle.rs | 5 ++--- src/widget_builders/textedit.rs | 2 +- src/widget_builders/textfield.rs | 2 +- 9 files changed, 22 insertions(+), 25 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index f95f082..cc7ce48 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,13 +8,13 @@ pub mod parser; pub mod widget_builders; use crate::parser::QML; use crate::parser::{parse_qml, Value}; -use crate::widget_builders::{QmlWidgetBuilder, QmlContext}; +use crate::widget_builders::{QmlContext, QmlWidgetBuilder}; use evmap::{ReadHandle, WriteHandle}; +use rand::Rng; use std::borrow::BorrowMut; use std::collections::VecDeque; use std::sync::mpsc; -use rand::Rng; #[macro_use] extern crate pest_derive; @@ -40,8 +40,10 @@ impl Widget for MainViewState { let (r, w) = evmap::new(); - - let mut qmlctx = QmlContext{ indexes: vec![], code: Default::default() }; + let mut qmlctx = QmlContext { + indexes: vec![], + code: Default::default(), + }; let this = QmlWidgetBuilder::new().build(widget, 0, 0, top_level[0].0.clone(), top_level[0].1.clone(), ctx, qmlctx.borrow_mut()); //render_ctx(widget, ctx, &top_level, 0, 0, ids.borrow_mut()).unwrap(); ctx.register_state( this, @@ -124,19 +126,16 @@ impl State for MVState { fn update(&mut self, _registry: &mut Registry, ctx: &mut Context) { match self.value_map.1.borrow_mut() { Some(w) => { - self.engine.register_fn("rand_opacity", move || -> (f32) { let mut rng = rand::thread_rng(); - rng.gen_range(0.0,1.0) as f32 + rng.gen_range(0.0, 1.0) as f32 }); for ((entity, property), code) in self.ids.code.iter() { - let result = self.engine.eval::<(f32)>(code.as_str()); - let point = result.unwrap(); + let point = result.unwrap(); println!("{}.{} = {} {:?}", entity, property, code, point); ctx.child(entity.as_str()).set::(property, point); - } for id in self.ids.indexes.iter() { @@ -148,7 +147,6 @@ impl State for MVState { } w.update(id.clone() + ".text", res.as_string()); } - } w.refresh(); } diff --git a/src/widget_builders/button.rs b/src/widget_builders/button.rs index 05a62a2..253223d 100644 --- a/src/widget_builders/button.rs +++ b/src/widget_builders/button.rs @@ -1,7 +1,7 @@ use crate::parser::Value::{QmlIdent, QmlString}; use crate::parser::{Value, QML}; use crate::state; -use crate::widget_builders::{WidgetBuilder, QmlContext}; +use crate::widget_builders::{QmlContext, WidgetBuilder}; use orbtk::prelude::HashMap; use orbtk::prelude::*; use orbtk::Entity; diff --git a/src/widget_builders/grid.rs b/src/widget_builders/grid.rs index bc5e531..fc67462 100644 --- a/src/widget_builders/grid.rs +++ b/src/widget_builders/grid.rs @@ -1,5 +1,5 @@ use crate::parser::{Value, QML}; -use crate::widget_builders::{parse_number, QmlWidgetBuilder, WidgetBuilder, QmlContext}; +use crate::widget_builders::{parse_number, QmlContext, QmlWidgetBuilder, WidgetBuilder}; use orbtk::prelude::HashMap; use orbtk::prelude::*; use orbtk::Entity; diff --git a/src/widget_builders/image.rs b/src/widget_builders/image.rs index 6a8f855..cd68697 100644 --- a/src/widget_builders/image.rs +++ b/src/widget_builders/image.rs @@ -1,7 +1,7 @@ use crate::parser::Value::{QmlIdent, QmlString}; use crate::parser::{Value, QML}; use crate::state; -use crate::widget_builders::{WidgetBuilder, QmlContext}; +use crate::widget_builders::{QmlContext, WidgetBuilder}; use orbtk::prelude::HashMap; use orbtk::prelude::*; use orbtk::Entity; @@ -21,7 +21,7 @@ impl WidgetBuilder for ImageBuilder { qmlctx.indexes.push(text.clone()); text.clone() } - _ => String::new() + _ => String::new(), }; let src = match properties.get("source") { diff --git a/src/widget_builders/import.rs b/src/widget_builders/import.rs index 9694b61..88d0159 100644 --- a/src/widget_builders/import.rs +++ b/src/widget_builders/import.rs @@ -1,6 +1,6 @@ use crate::parser::Value::QmlString; use crate::parser::{parse_qml, Value, QML}; -use crate::widget_builders::{parse_number, QmlWidgetBuilder, WidgetBuilder, QmlContext}; +use crate::widget_builders::{parse_number, QmlContext, QmlWidgetBuilder, WidgetBuilder}; use orbtk::prelude::HashMap; use orbtk::prelude::*; use orbtk::Entity; diff --git a/src/widget_builders/mod.rs b/src/widget_builders/mod.rs index 098e089..b47cc6d 100644 --- a/src/widget_builders/mod.rs +++ b/src/widget_builders/mod.rs @@ -8,19 +8,19 @@ use crate::widget_builders::textfield::TextBuilder; use orbtk::prelude::*; use orbtk::Entity; +use crate::widget_builders::image::ImageBuilder; use crate::widget_builders::import::ImportBuilder; use std::collections::HashMap; -use crate::widget_builders::image::ImageBuilder; pub mod button; pub mod grid; +pub mod image; pub mod import; pub mod rectangle; pub mod textedit; pub mod textfield; -pub mod image; -pub fn parse_color_property(properties: &HashMap, prop: &str) -> Color { +pub fn parse_color_property(properties: &HashMap, prop: &str) -> Color { match properties.get(prop) { Some(QmlString(col)) => match col.as_str() { "red" => Color::rgb(0xff, 00, 00), @@ -39,9 +39,9 @@ fn parse_number(val: Option<&Value>) -> f64 { } #[derive(Clone)] -pub struct QmlContext{ +pub struct QmlContext { pub(crate) indexes: Vec, - pub(crate) code: HashMap<(String, String),String> + pub(crate) code: HashMap<(String, String), String>, } pub trait WidgetBuilder { diff --git a/src/widget_builders/rectangle.rs b/src/widget_builders/rectangle.rs index b2c67cb..26e2e58 100644 --- a/src/widget_builders/rectangle.rs +++ b/src/widget_builders/rectangle.rs @@ -1,6 +1,6 @@ use crate::parser::Value::QmlString; use crate::parser::{Value, QML}; -use crate::widget_builders::{parse_number, QmlWidgetBuilder, WidgetBuilder, QmlContext, parse_color_property}; +use crate::widget_builders::{parse_color_property, parse_number, QmlContext, QmlWidgetBuilder, WidgetBuilder}; use orbtk::prelude::HashMap; use orbtk::prelude::*; use orbtk::Entity; @@ -13,11 +13,10 @@ impl WidgetBuilder for RectangleBuilder { let _width = parse_number(properties.get("width")); let _height = parse_number(properties.get("height")); - let mut rect = Container::new(); rect = rect.background(parse_color_property(&properties, "color")); rect = rect.border_brush(parse_color_property(&properties, "border.color")); - rect = rect.border_width(Thickness::new(1.0,1.0,1.0,1.0)); + rect = rect.border_width(Thickness::new(1.0, 1.0, 1.0, 1.0)); rect = rect.attach(Grid::row(row as usize)); rect = rect.attach(Grid::column(col as usize)); let qwb = QmlWidgetBuilder::new(); diff --git a/src/widget_builders/textedit.rs b/src/widget_builders/textedit.rs index 6c6d08e..f90bebe 100644 --- a/src/widget_builders/textedit.rs +++ b/src/widget_builders/textedit.rs @@ -1,7 +1,7 @@ use crate::parser::Value::{QmlIdent, QmlString}; use crate::parser::{Value, QML}; use crate::state; -use crate::widget_builders::{WidgetBuilder, QmlContext}; +use crate::widget_builders::{QmlContext, WidgetBuilder}; use orbtk::prelude::HashMap; use orbtk::prelude::*; use orbtk::Entity; diff --git a/src/widget_builders/textfield.rs b/src/widget_builders/textfield.rs index b084a9a..83bb04e 100644 --- a/src/widget_builders/textfield.rs +++ b/src/widget_builders/textfield.rs @@ -1,6 +1,6 @@ use crate::parser::Value::{QmlIdent, QmlString}; use crate::parser::{Value, QML}; -use crate::widget_builders::{WidgetBuilder, QmlContext}; +use crate::widget_builders::{QmlContext, WidgetBuilder}; use orbtk::prelude::HashMap; use orbtk::prelude::*; use orbtk::Entity;