migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 14:50:03 -04:00
Code Activity

Now painter is not affected by the current_viewport

Browse Source
This commit is contained in:
Konkitoman
2023-07-23 14:32:54 +03:00
parent ea2dcd8cb5
commit fdca2b9220
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/egui/src/painter.rs
View File

@@ -168,10 +168,6 @@ impl Painter {
/// Can be used for free painting. /// Can be used for free painting.
/// NOTE: all coordinates are screen coordinates! /// NOTE: all coordinates are screen coordinates!
pub fn add(&self, shape: impl Into<Shape>) -> ShapeIdx { pub fn add(&self, shape: impl Into<Shape>) -> ShapeIdx {
if self.ctx.current_viewport() != self.ctx.current_rendering_viewport() {
return self
.paint_list(|l| l.add(Rect::from_min_size(Pos2::ZERO, Vec2::ZERO), Shape::Noop));
}
if self.fade_to_color == Some(Color32::TRANSPARENT) { if self.fade_to_color == Some(Color32::TRANSPARENT) {
self.paint_list(|l| l.add(self.clip_rect, Shape::Noop)) self.paint_list(|l| l.add(self.clip_rect, Shape::Noop))
} else { } else {
@@ -185,9 +181,7 @@ impl Painter {
/// ///
/// Calling this once is generally faster than calling [`Self::add`] multiple times. /// Calling this once is generally faster than calling [`Self::add`] multiple times.
pub fn extend<I: IntoIterator<Item = Shape>>(&self, shapes: I) { pub fn extend<I: IntoIterator<Item = Shape>>(&self, shapes: I) {
if self.fade_to_color == Some(Color32::TRANSPARENT) if self.fade_to_color == Some(Color32::TRANSPARENT) {
|| self.ctx.current_viewport() != self.ctx.current_rendering_viewport()
{
return; return;
} }
if self.fade_to_color.is_some() { if self.fade_to_color.is_some() {
@@ -203,9 +197,7 @@ impl Painter {
/// Modify an existing [`Shape`]. /// Modify an existing [`Shape`].
pub fn set(&self, idx: ShapeIdx, shape: impl Into<Shape>) { pub fn set(&self, idx: ShapeIdx, shape: impl Into<Shape>) {
if self.fade_to_color == Some(Color32::TRANSPARENT) if self.fade_to_color == Some(Color32::TRANSPARENT) {
|| self.ctx.current_viewport() != self.ctx.current_rendering_viewport()
{
return; return;
} }
let mut shape = shape.into(); let mut shape = shape.into();
@@ -398,9 +390,6 @@ impl Painter {
font_id: FontId, font_id: FontId,
text_color: Color32, text_color: Color32,
) -> Rect { ) -> Rect {
if self.ctx.current_viewport() != self.ctx.current_rendering_viewport() {
return Rect::from_min_size(Pos2::ZERO, Vec2::ZERO);
}
let galley = self.layout_no_wrap(text.to_string(), font_id, text_color); let galley = self.layout_no_wrap(text.to_string(), font_id, text_color);
let rect = anchor.anchor_rect(Rect::from_min_size(pos, galley.size())); let rect = anchor.anchor_rect(Rect::from_min_size(pos, galley.size()));
self.galley(rect.min, galley); self.galley(rect.min, galley);