diff --git a/crates/egui/src/containers/sides.rs b/crates/egui/src/containers/sides.rs index 8a67c6c5e..709c1b645 100644 --- a/crates/egui/src/containers/sides.rs +++ b/crates/egui/src/containers/sides.rs @@ -185,7 +185,7 @@ impl Sides { 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) } SidesKind::ShrinkRight => { @@ -205,7 +205,7 @@ impl Sides { 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) } SidesKind::Extend => { @@ -225,7 +225,7 @@ impl Sides { 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(); if ui.is_sizing_pass() { diff --git a/crates/egui/src/context.rs b/crates/egui/src/context.rs index f3bc73cec..9594f03e9 100644 --- a/crates/egui/src/context.rs +++ b/crates/egui/src/context.rs @@ -2689,7 +2689,7 @@ impl Context { self.write(|ctx| { let mut used = ctx.viewport().this_pass.used_by_panels; for (_id, window) in ctx.memory.areas().visible_windows() { - used = used.union(window.rect()); + used |= window.rect(); } used.round_ui() }) diff --git a/crates/egui/src/layout.rs b/crates/egui/src/layout.rs index 003476be6..601d1e2e7 100644 --- a/crates/egui/src/layout.rs +++ b/crates/egui/src/layout.rs @@ -725,7 +725,7 @@ impl Layout { if self.main_wrap { if cursor.intersects(frame_rect.shrink(1.0)) { // make row/column larger if necessary - *cursor = cursor.union(frame_rect); + *cursor |= frame_rect; } else { // this is a new row or column. We temporarily use NAN for what will be filled in later. match self.main_dir { diff --git a/crates/egui/src/placer.rs b/crates/egui/src/placer.rs index 6a5d31be0..a56bcdb29 100644 --- a/crates/egui/src/placer.rs +++ b/crates/egui/src/placer.rs @@ -231,7 +231,7 @@ impl Placer { let region = &mut self.region; region.max_rect.min.x = rect.min.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.max.x = region.max_rect.max.x; @@ -246,7 +246,7 @@ impl Placer { let region = &mut self.region; region.max_rect.min.y = rect.min.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.max.y = region.max_rect.max.y; diff --git a/crates/egui/src/widgets/label.rs b/crates/egui/src/widgets/label.rs index aa229adff..b25cb908d 100644 --- a/crates/egui/src/widgets/label.rs +++ b/crates/egui/src/widgets/label.rs @@ -165,7 +165,7 @@ impl Label { }; 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 { diff --git a/crates/egui_extras/src/layout.rs b/crates/egui_extras/src/layout.rs index d9210187b..8b2a0fd6e 100644 --- a/crates/egui_extras/src/layout.rs +++ b/crates/egui_extras/src/layout.rs @@ -162,7 +162,7 @@ impl<'l> StripLayout<'l> { } else if flags.clip { max_rect } else { - max_rect.union(used_rect) + max_rect | used_rect }; self.set_pos(allocation_rect); diff --git a/crates/epaint/src/text/text_layout.rs b/crates/epaint/src/text/text_layout.rs index 8581b067f..8d4a90fb7 100644 --- a/crates/epaint/src/text/text_layout.rs +++ b/crates/epaint/src/text/text_layout.rs @@ -696,8 +696,7 @@ fn galley_from_rows( let row = Arc::make_mut(&mut placed_row.row); row.visuals = tessellate_row(point_scale, &job, &format_summary, row); - mesh_bounds = - mesh_bounds.union(row.visuals.mesh_bounds.translate(placed_row.pos.to_vec2())); + mesh_bounds |= row.visuals.mesh_bounds.translate(placed_row.pos.to_vec2()); num_vertices += row.visuals.mesh.vertices.len(); num_indices += row.visuals.mesh.indices.len(); diff --git a/crates/epaint/src/text/text_layout_types.rs b/crates/epaint/src/text/text_layout_types.rs index 79ca50556..7635dcede 100644 --- a/crates/epaint/src/text/text_layout_types.rs +++ b/crates/epaint/src/text/text_layout_types.rs @@ -865,12 +865,9 @@ impl Galley { .extend(galley.rows.iter().enumerate().map(|(row_idx, placed_row)| { let new_pos = placed_row.pos + current_y_offset * Vec2::Y; let new_pos = new_pos.round_to_pixels(pixels_per_point); - merged_galley.mesh_bounds = merged_galley - .mesh_bounds - .union(placed_row.visuals.mesh_bounds.translate(new_pos.to_vec2())); - merged_galley.rect = merged_galley - .rect - .union(Rect::from_min_size(new_pos, placed_row.size)); + merged_galley.mesh_bounds |= + placed_row.visuals.mesh_bounds.translate(new_pos.to_vec2()); + merged_galley.rect |= Rect::from_min_size(new_pos, placed_row.size); let mut row = placed_row.row.clone(); let is_last_row_in_galley = row_idx + 1 == galley.rows.len();