djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Shape::hline and Shape::vline

Browse source
This commit is contained in:
Emil Ernerfeldt 2022-07-30 15:34:24 +02:00
parent c62f3409bd
commit d659e5d24f
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
egui/src/painter.rs
View file

@ -2,7 +2,7 @@ use std::ops::RangeInclusive;
use std::sync::Arc; use std::sync::Arc;
use crate::{ use crate::{
emath::{pos2, Align2, Pos2, Rect, Vec2}, emath::{Align2, Pos2, Rect, Vec2},
layers::{LayerId, PaintList, ShapeIdx}, layers::{LayerId, PaintList, ShapeIdx},
Color32, Context, FontId, Color32, Context, FontId,
}; };
@ -257,18 +257,12 @@ impl Painter {
/// Paints a horizontal line. /// Paints a horizontal line.
pub fn hline(&self, x: RangeInclusive<f32>, y: f32, stroke: impl Into<Stroke>) { pub fn hline(&self, x: RangeInclusive<f32>, y: f32, stroke: impl Into<Stroke>) {
self.add(Shape::LineSegment { self.add(Shape::hline(x, y, stroke));
points: [pos2(*x.start(), y), pos2(*x.end(), y)],
stroke: stroke.into(),
});
} }
/// Paints a vertical line. /// Paints a vertical line.
pub fn vline(&self, x: f32, y: RangeInclusive<f32>, stroke: impl Into<Stroke>) { pub fn vline(&self, x: f32, y: RangeInclusive<f32>, stroke: impl Into<Stroke>) {
self.add(Shape::LineSegment { self.add(Shape::vline(x, y, stroke));
points: [pos2(x, *y.start()), pos2(x, *y.end())],
stroke: stroke.into(),
});
} }
pub fn circle( pub fn circle(

17
epaint/src/shape.rs
View file

@ -1,5 +1,6 @@
//! The different shapes that can be painted. //! The different shapes that can be painted.
use std::ops::RangeInclusive;
use std::{any::Any, sync::Arc}; use std::{any::Any, sync::Arc};
use crate::{ use crate::{
@ -72,6 +73,22 @@ impl Shape {
} }
} }
/// A horizontal line.
pub fn hline(x: RangeInclusive<f32>, y: f32, stroke: impl Into<Stroke>) -> Self {
Shape::LineSegment {
points: [pos2(*x.start(), y), pos2(*x.end(), y)],
stroke: stroke.into(),
}
}
/// A vertical line.
pub fn vline(x: f32, y: RangeInclusive<f32>, stroke: impl Into<Stroke>) -> Self {
Shape::LineSegment {
points: [pos2(x, *y.start()), pos2(x, *y.end())],
stroke: stroke.into(),
}
}
/// A line through many points. /// A line through many points.
/// ///
/// Use [`Self::line_segment`] instead if your line only connects two points. /// Use [`Self::line_segment`] instead if your line only connects two points.