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

Replace some more union usages

Browse Source
This commit is contained in:
lucasmerlin
2025-07-09 14:59:51 +02:00
parent 86d1c0e40a
commit 57accb6e1d
8 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/egui/src/containers/sides.rs
View File

@@ -185,7 +185,7 @@ impl Sides {
wrap_mode, wrap_mode,
); );
ui.advance_cursor_after_rect(left_rect.union(right_rect)); ui.advance_cursor_after_rect(left_rect | right_rect);
(result_left, result_right) (result_left, result_right)
} }
SidesKind::ShrinkRight => { SidesKind::ShrinkRight => {
@@ -205,7 +205,7 @@ impl Sides {
wrap_mode, wrap_mode,
); );
ui.advance_cursor_after_rect(left_rect.union(right_rect)); ui.advance_cursor_after_rect(left_rect | right_rect);
(result_left, result_right) (result_left, result_right)
} }
SidesKind::Extend => { SidesKind::Extend => {
@@ -225,7 +225,7 @@ impl Sides {
None, None,
); );
let mut final_rect = left_rect.union(right_rect); let mut final_rect = left_rect | right_rect;
let min_width = left_rect.width() + spacing + right_rect.width(); let min_width = left_rect.width() + spacing + right_rect.width();
if ui.is_sizing_pass() { if ui.is_sizing_pass() {

2
crates/egui/src/context.rs
View File

@@ -2689,7 +2689,7 @@ impl Context {
self.write(|ctx| { self.write(|ctx| {
let mut used = ctx.viewport().this_pass.used_by_panels; let mut used = ctx.viewport().this_pass.used_by_panels;
for (_id, window) in ctx.memory.areas().visible_windows() { for (_id, window) in ctx.memory.areas().visible_windows() {
used = used.union(window.rect()); used |= window.rect();
} }
used.round_ui() used.round_ui()
}) })

2
crates/egui/src/layout.rs
View File

@@ -725,7 +725,7 @@ impl Layout {
if self.main_wrap { if self.main_wrap {
if cursor.intersects(frame_rect.shrink(1.0)) { if cursor.intersects(frame_rect.shrink(1.0)) {
// make row/column larger if necessary // make row/column larger if necessary
*cursor = cursor.union(frame_rect); *cursor |= frame_rect;
} else { } else {
// this is a new row or column. We temporarily use NAN for what will be filled in later. // this is a new row or column. We temporarily use NAN for what will be filled in later.
match self.main_dir { match self.main_dir {

4
crates/egui/src/placer.rs
View File

@@ -231,7 +231,7 @@ impl Placer {
let region = &mut self.region; let region = &mut self.region;
region.max_rect.min.x = rect.min.x; region.max_rect.min.x = rect.min.x;
region.max_rect.max.x = rect.max.x; region.max_rect.max.x = rect.max.x;
region.max_rect = region.max_rect.union(region.min_rect); // make sure we didn't shrink too much region.max_rect |= region.min_rect; // make sure we didn't shrink too much
region.cursor.min.x = region.max_rect.min.x; region.cursor.min.x = region.max_rect.min.x;
region.cursor.max.x = region.max_rect.max.x; region.cursor.max.x = region.max_rect.max.x;
@@ -246,7 +246,7 @@ impl Placer {
let region = &mut self.region; let region = &mut self.region;
region.max_rect.min.y = rect.min.y; region.max_rect.min.y = rect.min.y;
region.max_rect.max.y = rect.max.y; region.max_rect.max.y = rect.max.y;
region.max_rect = region.max_rect.union(region.min_rect); // make sure we didn't shrink too much region.max_rect |= region.min_rect; // make sure we didn't shrink too much
region.cursor.min.y = region.max_rect.min.y; region.cursor.min.y = region.max_rect.min.y;
region.cursor.max.y = region.max_rect.max.y; region.cursor.max.y = region.max_rect.max.y;

2
crates/egui/src/widgets/label.rs
View File

@@ -165,7 +165,7 @@ impl Label {
}; };
select_sense -= Sense::FOCUSABLE; // Don't move focus to labels with TAB key. select_sense -= Sense::FOCUSABLE; // Don't move focus to labels with TAB key.
sense = sense.union(select_sense); sense |= select_sense;
} }
if let WidgetText::Galley(galley) = self.text { if let WidgetText::Galley(galley) = self.text {

2
crates/egui_extras/src/layout.rs
View File

@@ -162,7 +162,7 @@ impl<'l> StripLayout<'l> {
} else if flags.clip { } else if flags.clip {
max_rect max_rect
} else { } else {
max_rect.union(used_rect) max_rect | used_rect
}; };
self.set_pos(allocation_rect); self.set_pos(allocation_rect);

3
crates/epaint/src/text/text_layout.rs
View File

@@ -696,8 +696,7 @@ fn galley_from_rows(
let row = Arc::make_mut(&mut placed_row.row); let row = Arc::make_mut(&mut placed_row.row);
row.visuals = tessellate_row(point_scale, &job, &format_summary, row); row.visuals = tessellate_row(point_scale, &job, &format_summary, row);
mesh_bounds = mesh_bounds |= row.visuals.mesh_bounds.translate(placed_row.pos.to_vec2());
mesh_bounds.union(row.visuals.mesh_bounds.translate(placed_row.pos.to_vec2()));
num_vertices += row.visuals.mesh.vertices.len(); num_vertices += row.visuals.mesh.vertices.len();
num_indices += row.visuals.mesh.indices.len(); num_indices += row.visuals.mesh.indices.len();

9
crates/epaint/src/text/text_layout_types.rs
View File

@@ -865,12 +865,9 @@ impl Galley {
.extend(galley.rows.iter().enumerate().map(|(row_idx, placed_row)| { .extend(galley.rows.iter().enumerate().map(|(row_idx, placed_row)| {
let new_pos = placed_row.pos + current_y_offset * Vec2::Y; let new_pos = placed_row.pos + current_y_offset * Vec2::Y;
let new_pos = new_pos.round_to_pixels(pixels_per_point); let new_pos = new_pos.round_to_pixels(pixels_per_point);
merged_galley.mesh_bounds = merged_galley merged_galley.mesh_bounds |=
.mesh_bounds placed_row.visuals.mesh_bounds.translate(new_pos.to_vec2());
.union(placed_row.visuals.mesh_bounds.translate(new_pos.to_vec2())); merged_galley.rect |= Rect::from_min_size(new_pos, placed_row.size);
merged_galley.rect = merged_galley
.rect
.union(Rect::from_min_size(new_pos, placed_row.size));
let mut row = placed_row.row.clone(); let mut row = placed_row.row.clone();
let is_last_row_in_galley = row_idx + 1 == galley.rows.len(); let is_last_row_in_galley = row_idx + 1 == galley.rows.len();