fix style

emilk · Jan 27, 2024 · 0f6f82c · 0f6f82c
1 parent 24143f4
commit 0f6f82c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/crates/egui/src/memory.rs b/crates/egui/src/memory.rs
@@ -91,6 +91,7 @@ pub struct Memory {
     // Per-viewport:
     areas: ViewportIdMap<Areas>,
     layer_transforms: HashMap<LayerId, LayerTransform>,
+
     #[cfg_attr(feature = "persistence", serde(skip))]
     pub(crate) interactions: ViewportIdMap<Interaction>,
 
@@ -154,7 +155,9 @@ impl FocusDirection {
     }
 }
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "persistence", serde(default))]
 pub struct LayerTransform {
     pub translation: Vec2,
     pub scale: f32,
@@ -632,10 +635,12 @@ impl Memory {
         self.areas.entry(self.viewport_id).or_default()
     }
 
+    /// Access layer transformations.
     pub fn layer_transforms(&self) -> &HashMap<LayerId, LayerTransform> {
         &self.layer_transforms
     }
 
+    /// Access layer transformations.
     pub fn layer_transforms_mut(&mut self) -> &mut HashMap<LayerId, LayerTransform> {
         &mut self.layer_transforms
     }
@@ -935,7 +940,7 @@ impl Areas {
                             rect = rect.expand(resize_interact_radius_side);
                         }
 
-                        if let Some(transform) = layer_transforms.get(&layer) {
+                        if let Some(transform) = layer_transforms.get(layer) {
                             rect = transform.apply(rect);
                         }
 

diff --git a/crates/egui_demo_lib/src/demo/drag_and_drop.rs b/crates/egui_demo_lib/src/demo/drag_and_drop.rs
@@ -27,7 +27,7 @@ pub fn drag_source(ui: &mut Ui, id: Id, body: impl FnOnce(&mut Ui)) {
 
         if let Some(pointer_pos) = ui.ctx().pointer_interact_pos() {
             let delta = pointer_pos - response.rect.center();
-            ui.ctx().transform_layer(layer_id, delta);
+            ui.ctx().transform_layer(layer_id, delta, 1.0);
         }
     }
 }

diff --git a/crates/epaint/src/shape.rs b/crates/epaint/src/shape.rs
@@ -389,7 +389,7 @@ impl Shape {
             Self::Text(text_shape) => {
                 transform_point(&mut text_shape.pos);
                 let mut galley = (*text_shape.galley).clone();
-                for row in galley.rows.iter_mut() {
+                for row in &mut galley.rows {
                     row.visuals.mesh.transform(Vec2::ZERO, scale);
                 }
 

diff --git a/examples/test_viewports/src/main.rs b/examples/test_viewports/src/main.rs
@@ -428,7 +428,7 @@ fn drag_source<R>(
 
         if let Some(pointer_pos) = ui.ctx().pointer_interact_pos() {
             let delta = pointer_pos - res.response.rect.center();
-            ui.ctx().transform_layer(layer_id, delta);
+            ui.ctx().transform_layer(layer_id, delta, 1.0);
         }
 
         res