Use with_translation wherever possible

This commit is contained in:
Héctor Ramón Jiménez 2024-02-02 14:31:17 +01:00
parent d8dffa411b
commit a06682ff42
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
3 changed files with 29 additions and 38 deletions

View file

@ -7,7 +7,7 @@ use crate::core::renderer;
use crate::core::widget::tree::{self, Tree};
use crate::core::{
Clipboard, Element, Layout, Length, Pixels, Point, Rectangle, Shell, Size,
Transformation, Vector, Widget,
Vector, Widget,
};
use std::hash::Hash;
@ -328,21 +328,18 @@ where
};
renderer.with_layer(bounds, |renderer| {
renderer.with_transformation(
Transformation::translate(translation.x, translation.y),
|renderer| {
image::Renderer::draw(
renderer,
self.handle.clone(),
self.filter_method,
Rectangle {
x: bounds.x,
y: bounds.y,
..Rectangle::with_size(image_size)
},
);
},
);
renderer.with_translation(translation, |renderer| {
image::Renderer::draw(
renderer,
self.handle.clone(),
self.filter_method,
Rectangle {
x: bounds.x,
y: bounds.y,
..Rectangle::with_size(image_size)
},
);
});
});
}
}

View file

@ -43,7 +43,7 @@ use crate::core::widget;
use crate::core::widget::tree::{self, Tree};
use crate::core::{
Clipboard, Element, Layout, Length, Pixels, Point, Rectangle, Shell, Size,
Transformation, Vector, Widget,
Vector, Widget,
};
/// A collection of panes distributed using either vertical or horizontal splits
@ -965,21 +965,18 @@ pub fn draw<Theme, Renderer, T>(
let translation = cursor_position
- Point::new(bounds.x + origin.x, bounds.y + origin.y);
renderer.with_transformation(
Transformation::translate(translation.x, translation.y),
|renderer| {
renderer.with_layer(bounds, |renderer| {
draw_pane(
pane,
renderer,
default_style,
layout,
pane_cursor,
viewport,
);
});
},
);
renderer.with_translation(translation, |renderer| {
renderer.with_layer(bounds, |renderer| {
draw_pane(
pane,
renderer,
default_style,
layout,
pane_cursor,
viewport,
);
});
});
}
}

View file

@ -5,8 +5,7 @@ use crate::core::mouse;
use crate::core::renderer::{self, Renderer as _};
use crate::core::widget::Tree;
use crate::core::{
Color, Element, Layout, Length, Point, Rectangle, Size, Transformation,
Vector, Widget,
Color, Element, Layout, Length, Point, Rectangle, Size, Vector, Widget,
};
use crate::graphics::geometry::Renderer as _;
use crate::Renderer;
@ -120,10 +119,8 @@ impl<'a, Message, Theme> Widget<Message, Theme, Renderer> for QRCode<'a> {
});
});
let translation = Vector::new(bounds.x, bounds.y);
renderer.with_transformation(
Transformation::translate(translation.x, translation.y),
renderer.with_translation(
bounds.position() - Point::ORIGIN,
|renderer| {
renderer.draw(vec![geometry]);
},