reformat

Author: xarvic

druid/src/contexts.rs

@@ -321,7 +321,6 @@ impl_context_trait!(
     }
 );
 
-
 // methods on everyone
 impl_context_method!(
     EventCtx<'_, '_>,

druid/src/core.rs

@@ -14,9 +14,9 @@
 
 //! The fundamental druid types.
 
+use druid::contexts::CommandCtx;
 use std::collections::VecDeque;
 use tracing::{trace, trace_span, warn};
-use druid::contexts::CommandCtx;
 
 use crate::bloom::Bloom;
 use crate::command::sys::{CLOSE_WINDOW, SUB_WINDOW_HOST_TO_PARENT, SUB_WINDOW_PARENT_TO_HOST};
@@ -273,7 +273,13 @@ impl<T, W: Widget<T>> WidgetPod<T, W> {
     /// [`LifeCycle::Size`]: enum.LifeCycle.html#variant.Size
     //TODO: we are using CommandCtx because it allows every context but paint, but it might be a
     // confusing name.
-    pub fn set_origin<'a>(&mut self, ctx: &mut impl CommandCtx<'a>, _data: &T, _env: &Env, origin: Point) {
+    pub fn set_origin<'a>(
+        &mut self,
+        ctx: &mut impl CommandCtx<'a>,
+        _data: &T,
+        _env: &Env,
+        origin: Point,
+    ) {
         //TODO: decide whether we should keep data and env for compatibility or do a breaking change
         self.state.is_expecting_set_origin_call = false;
 

druid/src/widget/clip_box.rs

@@ -13,13 +13,13 @@
 // limitations under the License.
 
 use crate::commands::SCROLL_TO_VIEW;
+use crate::contexts::CommandCtx;
 use crate::debug_state::DebugState;
 use crate::kurbo::{Point, Rect, Size, Vec2};
 use crate::widget::prelude::*;
 use crate::widget::Axis;
 use crate::{Data, InternalLifeCycle, WidgetPod};
 use tracing::{info, instrument, trace, warn};
-use crate::contexts::CommandCtx;
 
 /// Represents the size and position of a rectangular "viewport" into a larger area.
 #[derive(Clone, Copy, Default, Debug, PartialEq)]
@@ -362,7 +362,13 @@ impl<T, W: Widget<T>> ClipBox<T, W> {
     /// Pans by `delta` units.
     ///
     /// Returns `true` if the scroll offset has changed.
-    pub fn pan_by<'a, C: CommandCtx<'a>>(&mut self, ctx: &mut C, data: &T, env: &Env, delta: Vec2) -> bool {
+    pub fn pan_by<'a, C: CommandCtx<'a>>(
+        &mut self,
+        ctx: &mut C,
+        data: &T,
+        env: &Env,
+        delta: Vec2,
+    ) -> bool {
         self.with_port(ctx, data, env, |_, port| {
             port.pan_by(delta);
         })
@@ -372,7 +378,13 @@ impl<T, W: Widget<T>> ClipBox<T, W> {
     ///
     /// If the target region is larger than the viewport, we will display the
     /// portion that fits, prioritizing the portion closest to the origin.
-    pub fn pan_to_visible<'a, C: CommandCtx<'a>>(&mut self, ctx: &mut C, data: &T, env: &Env, region: Rect) -> bool {
+    pub fn pan_to_visible<'a, C: CommandCtx<'a>>(
+        &mut self,
+        ctx: &mut C,
+        data: &T,
+        env: &Env,
+        region: Rect,
+    ) -> bool {
         self.with_port(ctx, data, env, |_, port| {
             port.pan_to_visible(region);
         })
@@ -381,7 +393,14 @@ impl<T, W: Widget<T>> ClipBox<T, W> {
     /// Pan to this position on a particular axis.
     ///
     /// Returns `true` if the scroll offset has changed.
-    pub fn pan_to_on_axis<'a, C: CommandCtx<'a>>(&mut self, ctx: &mut C, data: &T, env: &Env, axis: Axis, position: f64) -> bool {
+    pub fn pan_to_on_axis<'a, C: CommandCtx<'a>>(
+        &mut self,
+        ctx: &mut C,
+        data: &T,
+        env: &Env,
+        axis: Axis,
+        position: f64,
+    ) -> bool {
         self.with_port(ctx, data, env, |_, port| {
             port.pan_to_on_axis(axis, position);
         })
@@ -421,7 +440,7 @@ impl<T: Data, W: Widget<T>> Widget<T> for ClipBox<T, W> {
                     // prevent unexpected behaviour, by clipping SCROLL_TO_VIEW notifications
                     // to this ClipBox's viewport.
                     ctx.set_handled();
-                    self.with_port(ctx, data, env,|ctx, port| {
+                    self.with_port(ctx, data, env, |ctx, port| {
                         port.fixed_scroll_to_view_handling(
                             ctx,
                             *global_highlight_rect,

druid/src/widget/scroll.rs

@@ -15,12 +15,12 @@
 //! A container that scrolls its contents.
 
 use crate::commands::SCROLL_TO_VIEW;
+use crate::contexts::CommandCtx;
 use crate::debug_state::DebugState;
 use crate::widget::prelude::*;
 use crate::widget::{Axis, ClipBox};
 use crate::{scroll_component::*, Data, Rect, Vec2};
 use tracing::{instrument, trace};
-use crate::contexts::CommandCtx;
 
 /// A container that scrolls its contents.
 ///
@@ -55,22 +55,41 @@ impl<T, W: Widget<T>> Scroll<T, W> {
     /// Scroll by `delta` units.
     ///
     /// Returns `true` if the scroll offset has changed.
-    pub fn scroll_by<'a, C: CommandCtx<'a>>(&mut self, ctx: &mut C, data: &T, env: &Env, delta: Vec2) -> bool {
+    pub fn scroll_by<'a, C: CommandCtx<'a>>(
+        &mut self,
+        ctx: &mut C,
+        data: &T,
+        env: &Env,
+        delta: Vec2,
+    ) -> bool {
         self.clip.pan_by(ctx, data, env, delta)
     }
 
     /// Scroll the minimal distance to show the target rect.
     ///
     /// If the target region is larger than the viewport, we will display the
     /// portion that fits, prioritizing the portion closest to the origin.
-    pub fn scroll_to<'a, C: CommandCtx<'a>>(&mut self, ctx: &mut C, data: &T, env: &Env, region: Rect) -> bool {
+    pub fn scroll_to<'a, C: CommandCtx<'a>>(
+        &mut self,
+        ctx: &mut C,
+        data: &T,
+        env: &Env,
+        region: Rect,
+    ) -> bool {
         self.clip.pan_to_visible(ctx, data, env, region)
     }
 
     /// Scroll to this position on a particular axis.
     ///
     /// Returns `true` if the scroll offset has changed.
-    pub fn scroll_to_on_axis<'a, C: CommandCtx<'a>>(&mut self, ctx: &mut C, data: &T, env: &Env, axis: Axis, position: f64) -> bool {
+    pub fn scroll_to_on_axis<'a, C: CommandCtx<'a>>(
+        &mut self,
+        ctx: &mut C,
+        data: &T,
+        env: &Env,
+        axis: Axis,
+        position: f64,
+    ) -> bool {
         self.clip.pan_to_on_axis(ctx, data, env, axis, position)
     }
 }

druid/src/widget/textbox.rs

@@ -17,6 +17,7 @@
 use std::time::Duration;
 use tracing::{instrument, trace};
 
+use crate::contexts::CommandCtx;
 use crate::debug_state::DebugState;
 use crate::kurbo::Insets;
 use crate::piet::TextLayout as _;
@@ -29,7 +30,6 @@ use crate::{
     theme, ArcStr, Color, Command, FontDescriptor, HotKey, KeyEvent, KeyOrValue, Point, Rect,
     SysMods, TextAlignment, TimerToken, Vec2,
 };
-use crate::contexts::CommandCtx;
 
 use super::LabelText;
 
@@ -343,7 +343,8 @@ impl<T: TextStorage + EditableText> TextBox<T> {
         let is_visible =
             view_rect.contains(rect.origin()) && view_rect.contains(Point::new(rect.x1, rect.y1));
         if !is_visible {
-            self.inner.scroll_to(ctx, data, env, rect + SCROLL_TO_INSETS);
+            self.inner
+                .scroll_to(ctx, data, env, rect + SCROLL_TO_INSETS);
         }
     }