From 7a32dd1e52bba9d2ac416023efce9c645446027e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= Date: Thu, 24 Nov 2022 01:11:47 +0100 Subject: [PATCH] Rename to ChangeFlags --- src/view.rs | 4 ++-- src/view/button.rs | 6 +++--- src/view/text.rs | 6 +++--- src/widget.rs | 2 +- src/widget/button.rs | 6 +++--- src/widget/core.rs | 4 ++-- src/widget/text.rs | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/view.rs b/src/view.rs index 309545db1..33da1e2b6 100644 --- a/src/view.rs +++ b/src/view.rs @@ -35,7 +35,7 @@ use futures_task::{ArcWake, Waker}; use crate::{ event::EventResult, id::{Id, IdPath}, - widget::{UpdateFlags, Widget}, + widget::{ChangeFlags, Widget}, }; /// A view object representing a node in the UI. @@ -73,7 +73,7 @@ pub trait View: Send { id: &mut Id, state: &mut Self::State, element: &mut Self::Element, - ) -> UpdateFlags; + ) -> ChangeFlags; /// Propagate an event. /// diff --git a/src/view/button.rs b/src/view/button.rs index 987f78c04..8c2230032 100644 --- a/src/view/button.rs +++ b/src/view/button.rs @@ -14,7 +14,7 @@ use std::any::Any; -use crate::{event::EventResult, id::Id, widget::UpdateFlags}; +use crate::{event::EventResult, id::Id, widget::ChangeFlags}; use super::{Cx, View}; @@ -58,11 +58,11 @@ impl View for Button { _id: &mut crate::id::Id, _state: &mut Self::State, element: &mut Self::Element, - ) -> UpdateFlags { + ) -> ChangeFlags { if prev.label != self.label { element.set_label(self.label.clone()) } else { - UpdateFlags::empty() + ChangeFlags::empty() } } diff --git a/src/view/text.rs b/src/view/text.rs index 10642ca1c..2d39840c6 100644 --- a/src/view/text.rs +++ b/src/view/text.rs @@ -14,7 +14,7 @@ use std::any::Any; -use crate::{event::EventResult, id::Id, widget::UpdateFlags}; +use crate::{event::EventResult, id::Id, widget::ChangeFlags}; use super::{Cx, View}; @@ -35,11 +35,11 @@ impl View for String { _id: &mut crate::id::Id, _state: &mut Self::State, element: &mut Self::Element, - ) -> UpdateFlags { + ) -> ChangeFlags { if prev != self { element.set_text(self.clone()) } else { - UpdateFlags::empty() + ChangeFlags::empty() } } diff --git a/src/widget.rs b/src/widget.rs index 42ea1b227..ce0b42eb8 100644 --- a/src/widget.rs +++ b/src/widget.rs @@ -33,7 +33,7 @@ use piet_scene::SceneBuilder; use self::contexts::LifeCycleCx; pub use self::contexts::{AlignCx, CxState, EventCx, LayoutCx, PaintCx, PreparePaintCx, UpdateCx}; pub use self::core::Pod; -pub(crate) use self::core::{PodFlags, UpdateFlags, WidgetState}; +pub(crate) use self::core::{ChangeFlags, PodFlags, WidgetState}; pub use self::raw_event::{LifeCycle, RawEvent}; use self::align::SingleAlignment; diff --git a/src/widget/button.rs b/src/widget/button.rs index da0a7b517..2ad7e3415 100644 --- a/src/widget/button.rs +++ b/src/widget/button.rs @@ -22,7 +22,7 @@ use super::{ align::{FirstBaseline, LastBaseline, SingleAlignment}, contexts::LifeCycleCx, piet_scene_helpers::{self, UnitPoint}, - AlignCx, EventCx, LayoutCx, LifeCycle, PaintCx, RawEvent, UpdateCx, UpdateFlags, Widget, + AlignCx, ChangeFlags, EventCx, LayoutCx, LifeCycle, PaintCx, RawEvent, UpdateCx, Widget, }; pub struct Button { @@ -40,10 +40,10 @@ impl Button { } } - pub fn set_label(&mut self, label: String) -> UpdateFlags { + pub fn set_label(&mut self, label: String) -> ChangeFlags { self.label = label; self.layout = None; - UpdateFlags::REQUEST_LAYOUT | UpdateFlags::REQUEST_PAINT + ChangeFlags::REQUEST_LAYOUT | ChangeFlags::REQUEST_PAINT } } diff --git a/src/widget/core.rs b/src/widget/core.rs index aa8c47265..c16838a0b 100644 --- a/src/widget/core.rs +++ b/src/widget/core.rs @@ -52,7 +52,7 @@ bitflags! { bitflags! { #[derive(Default)] #[must_use] - pub struct UpdateFlags: u8 { + pub struct ChangeFlags: u8 { const REQUEST_UPDATE = 1; const REQUEST_LAYOUT = 2; const REQUEST_PAINT = 4; @@ -137,7 +137,7 @@ impl Pod { (*self.widget).as_any_mut().downcast_mut() } - pub fn mark(&mut self, flags: UpdateFlags) { + pub fn mark(&mut self, flags: ChangeFlags) { self.state .request(PodFlags::from_bits(flags.bits().into()).unwrap()); } diff --git a/src/widget/text.rs b/src/widget/text.rs index 83e83de70..65dc3bdd4 100644 --- a/src/widget/text.rs +++ b/src/widget/text.rs @@ -21,7 +21,7 @@ use crate::text::ParleyBrush; use super::{ align::{FirstBaseline, LastBaseline, SingleAlignment, VertAlignment}, contexts::LifeCycleCx, - AlignCx, EventCx, LayoutCx, LifeCycle, PaintCx, RawEvent, UpdateCx, UpdateFlags, Widget, + AlignCx, ChangeFlags, EventCx, LayoutCx, LifeCycle, PaintCx, RawEvent, UpdateCx, Widget, }; pub struct TextWidget { @@ -39,9 +39,9 @@ impl TextWidget { } } - pub fn set_text(&mut self, text: String) -> UpdateFlags { + pub fn set_text(&mut self, text: String) -> ChangeFlags { self.text = text; - UpdateFlags::REQUEST_LAYOUT | UpdateFlags::REQUEST_PAINT + ChangeFlags::REQUEST_LAYOUT | ChangeFlags::REQUEST_PAINT } }