alex/nih-plug
1
0
Fork 0
Code Activity

Scale PeakMeter ticks with integer DPI scale

Browse source
This commit is contained in:
Robbert van der Helm 2022-03-22 01:39:01 +01:00
parent 3273bb3a35
commit 66b8d6938a
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
nih_plug_vizia/src/widgets/peak_meter.rs
View file

@ -207,12 +207,12 @@ where
let bar_bounds = bounds.shrink(border_width / 2.0); let bar_bounds = bounds.shrink(border_width / 2.0);
let bar_ticks_start_x = bar_bounds.left().floor() as i32; let bar_ticks_start_x = bar_bounds.left().floor() as i32;
let bar_ticks_end_x = bar_bounds.right().ceil() as i32; let bar_ticks_end_x = bar_bounds.right().ceil() as i32;
// TODO: Right now this means that on higher DPI settings you'll end up with more, denser
// ticks. We can try keeping the number of ticks fixed, but I don't know how that // NOTE: We'll scale this with the nearest integer DPI ratio. That way it will still look
// would work with fractional scaling since we also want everything to stay aligned to // good at 2x scaling, and it won't look blurry at 1.x times scaling.
// the pixel grid. let dpi_scale = cx.style.dpi_factor.floor().max(1.0) as f32;
let bar_tick_coordinates = let bar_tick_coordinates = (bar_ticks_start_x..bar_ticks_end_x)
(bar_ticks_start_x..bar_ticks_end_x).step_by((TICK_WIDTH + TICK_GAP).round() as usize); .step_by(((TICK_WIDTH + TICK_GAP) * dpi_scale).round() as usize);
for tick_x in bar_tick_coordinates { for tick_x in bar_tick_coordinates {
let tick_fraction = let tick_fraction =
(tick_x - bar_ticks_start_x) as f32 / (bar_ticks_end_x - bar_ticks_start_x) as f32; (tick_x - bar_ticks_start_x) as f32 / (bar_ticks_end_x - bar_ticks_start_x) as f32;
@ -224,8 +224,8 @@ where
// femtovg draws paths centered on these coordinates, so in order to be pixel perfect we // femtovg draws paths centered on these coordinates, so in order to be pixel perfect we
// need to account for that. Otherwise the ticks will be 2px wide instead of 1px. // need to account for that. Otherwise the ticks will be 2px wide instead of 1px.
let mut path = Path::new(); let mut path = Path::new();
path.move_to(tick_x as f32 + 0.5, bar_bounds.top()); path.move_to(tick_x as f32 + (dpi_scale / 2.0), bar_bounds.top());
path.line_to(tick_x as f32 + 0.5, bar_bounds.bottom()); path.line_to(tick_x as f32 + (dpi_scale / 2.0), bar_bounds.bottom());
let grayscale_color = 0.3 + ((1.0 - tick_fraction) * 0.5); let grayscale_color = 0.3 + ((1.0 - tick_fraction) * 0.5);
let mut paint = Paint::color(femtovg::Color::rgbaf( let mut paint = Paint::color(femtovg::Color::rgbaf(
@ -234,7 +234,7 @@ where
grayscale_color, grayscale_color,
opacity, opacity,
)); ));
paint.set_line_width(TICK_WIDTH); paint.set_line_width(TICK_WIDTH * dpi_scale);
canvas.stroke_path(&mut path, paint); canvas.stroke_path(&mut path, paint);
} }
@ -244,7 +244,6 @@ where
bar_ticks_start_x as f32 bar_ticks_start_x as f32
+ ((bar_ticks_end_x - bar_ticks_start_x) as f32 * tick_fraction).round() + ((bar_ticks_end_x - bar_ticks_start_x) as f32 * tick_fraction).round()
}; };
if (MIN_TICK..MAX_TICK).contains(&peak_dbfs) { if (MIN_TICK..MAX_TICK).contains(&peak_dbfs) {
// femtovg draws paths centered on these coordinates, so in order to be pixel perfect we // femtovg draws paths centered on these coordinates, so in order to be pixel perfect we
// need to account for that. Otherwise the ticks will be 2px wide instead of 1px. // need to account for that. Otherwise the ticks will be 2px wide instead of 1px.