voxel/hUI
voxel/hUI
1
1
Fork 0
mirror of https://github.com/griffi-gh/hUI.git synced 2024-11-25 08:28:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

add border radius to progress bar

Browse source
This commit is contained in:
griffi-gh 2024-02-20 20:11:05 +01:00
parent ecc137bcd5
commit 2fdc075f3a
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
hui/src/element/builtin/progress_bar.rs
View file

@ -1,9 +1,6 @@
use glam::{vec2, Vec4, vec4}; use glam::{vec2, Vec4, vec4};
use crate::{ use crate::{
draw::UiDrawCommand, draw::{RoundedCorners, UiDrawCommand}, element::{MeasureContext, ProcessContext, UiElement}, layout::UiSize, measure::Response, rectangle::Corners
element::{MeasureContext, ProcessContext, UiElement},
measure::Response,
layout::UiSize
}; };
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
@ -12,6 +9,7 @@ pub struct ProgressBar {
pub value: f32, pub value: f32,
pub color_foreground: Vec4, pub color_foreground: Vec4,
pub color_background: Vec4, pub color_background: Vec4,
pub border_radius: Corners<f32>,
} }
impl Default for ProgressBar { impl Default for ProgressBar {
@ -21,6 +19,7 @@ impl Default for ProgressBar {
value: 0., value: 0.,
color_foreground: vec4(0.0, 0.0, 1.0, 1.0), color_foreground: vec4(0.0, 0.0, 1.0, 1.0),
color_background: vec4(0.0, 0.0, 0.0, 1.0), color_background: vec4(0.0, 0.0, 0.0, 1.0),
border_radius: Corners::all(0.),
} }
} }
} }
@ -51,12 +50,16 @@ impl UiElement for ProgressBar {
fn process(&self, ctx: ProcessContext) { fn process(&self, ctx: ProcessContext) {
let value = self.value.clamp(0., 1.); let value = self.value.clamp(0., 1.);
let rounded_corners =
(self.border_radius.max_f32() > 0.).then_some({
RoundedCorners::from_radius(self.border_radius)
});
if value < 1. { if value < 1. {
ctx.draw.add(UiDrawCommand::Rectangle { ctx.draw.add(UiDrawCommand::Rectangle {
position: ctx.layout.position, position: ctx.layout.position,
size: ctx.measure.size, size: ctx.measure.size,
color: self.color_background, color: self.color_background,
rounded_corners: None, rounded_corners
}); });
} }
if value > 0. { if value > 0. {
@ -64,7 +67,7 @@ impl UiElement for ProgressBar {
position: ctx.layout.position, position: ctx.layout.position,
size: ctx.measure.size * vec2(value, 1.0), size: ctx.measure.size * vec2(value, 1.0),
color: self.color_foreground, color: self.color_foreground,
rounded_corners: None, rounded_corners,
}); });
} }
} }