From f91ce6f1746d53e05e903aed5da6a6922f1cfa38 Mon Sep 17 00:00:00 2001 From: Jared Moulton Date: Thu, 30 May 2024 02:58:43 -0700 Subject: [PATCH] rename view style method to style_pass. (#478) This is to avoid confusion with the style method on the Decorators trait. This rename makes it so that when you want to call the style method on a view, but the Decorators trait isn't yet in scope, rust analyzer will suggest the correct method name. --- src/context.rs | 2 +- src/view.rs | 6 +++--- src/views/dropdown.rs | 2 +- src/views/editor/gutter.rs | 2 +- src/views/editor/view.rs | 2 +- src/views/label.rs | 2 +- src/views/list.rs | 2 +- src/views/scroll.rs | 2 +- src/views/slider.rs | 2 +- src/views/tab.rs | 2 +- src/views/text_input.rs | 2 +- src/views/toggle_button.rs | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/context.rs b/src/context.rs index 4e1406ac..e4288b78 100644 --- a/src/context.rs +++ b/src/context.rs @@ -613,7 +613,7 @@ impl<'a> StyleCx<'a> { } } - view.borrow_mut().style(self); + view.borrow_mut().style_pass(self); self.restore(); } diff --git a/src/view.rs b/src/view.rs index 5034fcfe..a1bb696c 100644 --- a/src/view.rs +++ b/src/view.rs @@ -230,7 +230,7 @@ pub trait View { /// /// If the style changes needs other passes to run you're expected to call /// `cx.app_state_mut().request_changes`. - fn style(&mut self, cx: &mut StyleCx<'_>) { + fn style_pass(&mut self, cx: &mut StyleCx<'_>) { for child in self.id().children() { cx.style_view(child); } @@ -319,8 +319,8 @@ impl View for Box { (**self).update(cx, state) } - fn style(&mut self, cx: &mut StyleCx) { - (**self).style(cx) + fn style_pass(&mut self, cx: &mut StyleCx) { + (**self).style_pass(cx) } fn layout(&mut self, cx: &mut LayoutCx) -> NodeId { diff --git a/src/views/dropdown.rs b/src/views/dropdown.rs index 4d092da0..b7081d54 100644 --- a/src/views/dropdown.rs +++ b/src/views/dropdown.rs @@ -58,7 +58,7 @@ impl View for DropDown { "DropDown".into() } - fn style(&mut self, cx: &mut crate::context::StyleCx<'_>) { + fn style_pass(&mut self, cx: &mut crate::context::StyleCx<'_>) { if self.style.read(cx) { cx.app_state_mut().request_paint(self.id); } diff --git a/src/views/editor/gutter.rs b/src/views/editor/gutter.rs index 066647b7..963bae5e 100644 --- a/src/views/editor/gutter.rs +++ b/src/views/editor/gutter.rs @@ -72,7 +72,7 @@ impl View for EditorGutterView { "Editor Gutter View".into() } - fn style(&mut self, cx: &mut crate::context::StyleCx<'_>) { + fn style_pass(&mut self, cx: &mut crate::context::StyleCx<'_>) { if self.gutter_style.read(cx) { cx.app_state_mut().request_paint(self.id()); } diff --git a/src/views/editor/view.rs b/src/views/editor/view.rs index db89404d..aa1b25b1 100644 --- a/src/views/editor/view.rs +++ b/src/views/editor/view.rs @@ -794,7 +794,7 @@ impl View for EditorView { self.id } - fn style(&mut self, cx: &mut crate::context::StyleCx<'_>) { + fn style_pass(&mut self, cx: &mut crate::context::StyleCx<'_>) { self.editor.with_untracked(|ed| { ed.es.update(|s| { if s.read(cx) { diff --git a/src/views/label.rs b/src/views/label.rs index ed4cfb29..3b7f4f64 100644 --- a/src/views/label.rs +++ b/src/views/label.rs @@ -165,7 +165,7 @@ impl View for Label { } } - fn style(&mut self, cx: &mut crate::context::StyleCx<'_>) { + fn style_pass(&mut self, cx: &mut crate::context::StyleCx<'_>) { if self.font.read(cx) | self.style.read(cx) { self.text_layout = None; self.available_text = None; diff --git a/src/views/list.rs b/src/views/list.rs index dcaf5c94..128fd14d 100644 --- a/src/views/list.rs +++ b/src/views/list.rs @@ -209,7 +209,7 @@ impl View for Item { "Item".into() } - fn style(&mut self, cx: &mut StyleCx<'_>) { + fn style_pass(&mut self, cx: &mut StyleCx<'_>) { let selected = self.selection.get_untracked(); if Some(self.index) == selected { cx.save(); diff --git a/src/views/scroll.rs b/src/views/scroll.rs index 2bd3714f..42a61edd 100644 --- a/src/views/scroll.rs +++ b/src/views/scroll.rs @@ -658,7 +658,7 @@ impl View for Scroll { found } - fn style(&mut self, cx: &mut crate::context::StyleCx<'_>) { + fn style_pass(&mut self, cx: &mut crate::context::StyleCx<'_>) { let style = cx.style(); self.scroll_style.read(cx); diff --git a/src/views/slider.rs b/src/views/slider.rs index d706c41f..6a6bb5a7 100644 --- a/src/views/slider.rs +++ b/src/views/slider.rs @@ -215,7 +215,7 @@ impl View for Slider { EventPropagation::Continue } - fn style(&mut self, cx: &mut crate::context::StyleCx<'_>) { + fn style_pass(&mut self, cx: &mut crate::context::StyleCx<'_>) { let style = cx.style(); let mut paint = false; diff --git a/src/views/tab.rs b/src/views/tab.rs index 5308ae0f..6a1eed8c 100644 --- a/src/views/tab.rs +++ b/src/views/tab.rs @@ -124,7 +124,7 @@ impl View for Tab { } } - fn style(&mut self, cx: &mut StyleCx<'_>) { + fn style_pass(&mut self, cx: &mut StyleCx<'_>) { for (i, child) in self.id.children().into_iter().enumerate() { cx.style_view(child); let child_view = child.state(); diff --git a/src/views/text_input.rs b/src/views/text_input.rs index a631c270..d3283da9 100644 --- a/src/views/text_input.rs +++ b/src/views/text_input.rs @@ -1014,7 +1014,7 @@ impl View for TextInput { EventPropagation::Continue } - fn style(&mut self, cx: &mut crate::context::StyleCx<'_>) { + fn style_pass(&mut self, cx: &mut crate::context::StyleCx<'_>) { let style = cx.style(); if self.font.read(cx) || self.text_buf.is_none() { self.update_text_layout(); diff --git a/src/views/toggle_button.rs b/src/views/toggle_button.rs index 56e75ea5..6bdeaa6f 100644 --- a/src/views/toggle_button.rs +++ b/src/views/toggle_button.rs @@ -233,7 +233,7 @@ impl View for ToggleButton { None } - fn style(&mut self, cx: &mut crate::context::StyleCx<'_>) { + fn style_pass(&mut self, cx: &mut crate::context::StyleCx<'_>) { if self.style.read(cx) { cx.app_state_mut().request_paint(self.id); }