migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 05:10:03 -04:00
Code Activity

Rename PaintCmd to Shape

Browse Source
This commit is contained in:
Emil Ernerfeldt
2021-01-10 11:43:01 +01:00
parent a0b0f36d29
commit fb2317c993
33 changed files with 225 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
egui_demo_lib/src/apps/color_test.rs
View File

@@ -300,7 +300,7 @@ fn vertex_gradient(ui: &mut Ui, bg_fill: Color32, gradient: &Gradient) -> Respon
if bg_fill != Default::default() {
let mut triangles = Triangles::default();
triangles.add_colored_rect(rect, bg_fill);
ui.painter().add(PaintCmd::triangles(triangles));
ui.painter().add(Shape::triangles(triangles));
}
{
let n = gradient.0.len();
@@ -317,7 +317,7 @@ fn vertex_gradient(ui: &mut Ui, bg_fill: Color32, gradient: &Gradient) -> Respon
triangles.add_triangle(2 * i + 1, 2 * i + 2, 2 * i + 3);
}
}
ui.painter().add(PaintCmd::triangles(triangles));
ui.painter().add(Shape::triangles(triangles));
}
response
}

6
egui_demo_lib/src/apps/demo/dancing_strings.rs
View File

@@ -34,7 +34,7 @@ impl super::View for DancingStrings {
let desired_size = ui.available_width() * vec2(1.0, 0.35);
let (_id, rect) = ui.allocate_space(desired_size);
let mut cmds = vec![];
let mut shapes = vec![];
for &mode in &[2, 3, 5] {
let mode = mode as f32;
@@ -55,13 +55,13 @@ impl super::View for DancingStrings {
.collect();
let thickness = 10.0 / mode;
cmds.push(paint::PaintCmd::line(
shapes.push(paint::Shape::line(
points,
Stroke::new(thickness, Color32::from_additive_luminance(196)),
));
}
ui.painter().extend(cmds);
ui.painter().extend(shapes);
});
ui.add(crate::__egui_github_link_file!());
}

4
egui_demo_lib/src/apps/demo/drag_and_drop.rs
View File

@@ -43,7 +43,7 @@ pub fn drop_target<R>(
let outer_rect_bounds = ui.available_rect_before_wrap();
let inner_rect = outer_rect_bounds.shrink2(margin);
let where_to_put_background = ui.painter().add(PaintCmd::Noop);
let where_to_put_background = ui.painter().add(Shape::Noop);
let mut content_ui = ui.child_ui(inner_rect, *ui.layout());
let ret = body(&mut content_ui);
let outer_rect = Rect::from_min_max(outer_rect_bounds.min, content_ui.min_rect().max + margin);
@@ -61,7 +61,7 @@ pub fn drop_target<R>(
ui.painter().set(
where_to_put_background,
PaintCmd::Rect {
Shape::Rect {
corner_radius: style.corner_radius,
fill: style.bg_fill,
stroke: style.bg_stroke,

2
egui_demo_lib/src/apps/demo/painting.rs
View File

@@ -52,7 +52,7 @@ impl Painting {
for line in &self.lines {
if line.len() >= 2 {
let points: Vec<Pos2> = line.iter().map(|p| rect.min + *p).collect();
painter.add(PaintCmd::line(points, self.stroke));
painter.add(Shape::line(points, self.stroke));
}
}
}