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

epaint: Fix compile errors related to ArcPieShape

Browse Source
This commit is contained in:
Varphone Wong
2024-08-30 16:58:30 +08:00
parent 7d32e74c81
commit b94a2251b3
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/epaint/src/shape.rs
View File

@@ -7,7 +7,7 @@ use crate::{
text::{FontId, Fonts, Galley}, text::{FontId, Fonts, Galley},
Color32, Mesh, Stroke, TextureId, Color32, Mesh, Stroke, TextureId,
}; };
use emath::{pos2, Align2, Pos2, Rangef, Rect, TSTransform, Vec2}; use emath::{pos2, vec2, Align2, Pos2, Rangef, Rect, TSTransform, Vec2};
pub use crate::{CubicBezierShape, QuadraticBezierShape}; pub use crate::{CubicBezierShape, QuadraticBezierShape};

4
crates/epaint/src/shape_transform.rs
View File

@@ -1,8 +1,8 @@
use std::sync::Arc; use std::sync::Arc;
use crate::{ use crate::{
color, CircleShape, Color32, ColorMode, CubicBezierShape, EllipseShape, Mesh, PathShape, color, ArcPieShape, CircleShape, Color32, ColorMode, CubicBezierShape, EllipseShape, Mesh,
QuadraticBezierShape, RectShape, Shape, TextShape, PathShape, QuadraticBezierShape, RectShape, Shape, TextShape,
}; };
/// Remember to handle [`Color32::PLACEHOLDER`] specially! /// Remember to handle [`Color32::PLACEHOLDER`] specially!

9
crates/epaint/src/tessellator.rs
View File

@@ -7,9 +7,9 @@
use crate::texture_atlas::PreparedDisc; use crate::texture_atlas::PreparedDisc;
use crate::{ use crate::{
color, emath, stroke, CircleShape, ClippedPrimitive, ClippedShape, Color32, CubicBezierShape, color, emath, stroke, ArcPieShape, CircleShape, ClippedPrimitive, ClippedShape, Color32,
EllipseShape, Mesh, PathShape, Primitive, QuadraticBezierShape, RectShape, Rounding, Shape, CubicBezierShape, EllipseShape, Mesh, PathShape, Primitive, QuadraticBezierShape, RectShape,
Stroke, TextShape, TextureId, Vertex, WHITE_UV, Rounding, Shape, Stroke, TextShape, TextureId, Vertex, WHITE_UV,
}; };
use emath::{pos2, remap, vec2, NumExt, Pos2, Rect, Rot2, Vec2}; use emath::{pos2, remap, vec2, NumExt, Pos2, Rect, Rot2, Vec2};
@@ -1519,7 +1519,8 @@ impl Tessellator {
if closed { if closed {
self.scratchpad_path self.scratchpad_path
.add_pie(center, radius, start_angle, end_angle); .add_pie(center, radius, start_angle, end_angle);
self.scratchpad_path.fill(self.feathering, fill, out); self.scratchpad_path
.fill(self.feathering, fill, &stroke, out);
self.scratchpad_path self.scratchpad_path
.stroke_closed(self.feathering, &stroke, out); .stroke_closed(self.feathering, &stroke, out);
} else { } else {