nit: cleaned up ui a bit

This commit is contained in:
2025-11-21 01:03:52 +03:00
parent 14a143708f
commit a2a102cdb6
7 changed files with 53 additions and 39 deletions

View File

@@ -2,6 +2,12 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## [0.3.6] - 2025-07-15
### 🛠 Maintenance
- cleaned up io a bit
## [0.3.5] - 2025-07-15 ## [0.3.5] - 2025-07-15
### 🛠 Maintenance ### 🛠 Maintenance

2
Cargo.lock generated
View File

@@ -869,7 +869,7 @@ dependencies = [
[[package]] [[package]]
name = "egui_knob" name = "egui_knob"
version = "0.3.5" version = "0.3.6"
dependencies = [ dependencies = [
"eframe", "eframe",
"egui", "egui",

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "egui_knob" name = "egui_knob"
version = "0.3.5" version = "0.3.6"
edition = "2024" edition = "2024"
authors = ["Daniel Dada"] authors = ["Daniel Dada"]
description = "A simple knob widget for egui" description = "A simple knob widget for egui"

View File

@@ -27,7 +27,7 @@ To use the Knob widget in your project, add the following to your `Cargo.toml`:
[dependencies] [dependencies]
egui = "0.33" egui = "0.33"
eframe = "0.33" eframe = "0.33"
egui_knob = "0.3.5" egui_knob = "0.3.6"
``` ```
## Usage ## Usage

View File

@@ -4,13 +4,13 @@ use egui_knob::{Knob, KnobStyle, LabelPosition};
fn main() -> eframe::Result<()> { fn main() -> eframe::Result<()> {
let options = eframe::NativeOptions { let options = eframe::NativeOptions {
viewport: egui::ViewportBuilder::default() viewport: egui::ViewportBuilder::default()
.with_inner_size([800.0, 600.0]) .with_inner_size([600.0, 350.0])
.with_title("egui_knob demo"), .with_title("Knob demo"),
..Default::default() ..Default::default()
}; };
eframe::run_native( eframe::run_native(
"egui_knob demo", "Knob demo",
options, options,
Box::new(|_cc| Ok(Box::new(KnobDemo::default()))), Box::new(|_cc| Ok(Box::new(KnobDemo::default()))),
) )
@@ -43,7 +43,7 @@ impl Default for KnobDemo {
impl eframe::App for KnobDemo { impl eframe::App for KnobDemo {
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) { fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
egui::CentralPanel::default().show(ctx, |ui| { egui::CentralPanel::default().show(ctx, |ui| {
ui.heading("egui_knob demo"); ui.heading("Knob demo");
ui.separator(); ui.separator();
ui.horizontal(|ui| { ui.horizontal(|ui| {
@@ -82,7 +82,6 @@ impl eframe::App for KnobDemo {
.enumerate() .enumerate()
{ {
ui.vertical(|ui| { ui.vertical(|ui| {
ui.label(*label);
let mut knob = Knob::new(&mut self.values[i], 0.0, 1.0, *config) let mut knob = Knob::new(&mut self.values[i], 0.0, 1.0, *config)
.with_label(*label, LabelPosition::Bottom) .with_label(*label, LabelPosition::Bottom)
.with_background_arc(self.show_bg_arc) .with_background_arc(self.show_bg_arc)

BIN
scrot.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 42 KiB

View File

@@ -32,11 +32,18 @@ impl<'a> KnobRenderer<'a> {
pub fn render_knob(&self, painter: &Painter, center: Pos2, radius: f32, hovered: bool) { pub fn render_knob(&self, painter: &Painter, center: Pos2, radius: f32, hovered: bool) {
let knob_color = if hovered { let knob_color = if hovered {
self.config.colors.knob_color.linear_multiply(1.2) self.config.colors.knob_color.linear_multiply(1.15)
} else { } else {
self.config.colors.knob_color self.config.colors.knob_color
}; };
// TODO: make an option
painter.circle_filled(
center,
radius - self.config.stroke_width / 2.0,
self.config.colors.knob_color.gamma_multiply(0.15),
);
painter.circle_stroke( painter.circle_stroke(
center, center,
radius, radius,
@@ -50,11 +57,11 @@ impl<'a> KnobRenderer<'a> {
let angle = self.compute_angle(); let angle = self.compute_angle();
match self.config.style { match self.config.style {
KnobStyle::Wiper => { KnobStyle::Wiper => {
let pointer = center + Vec2::angled(angle) * (radius * 0.7); let pointer = center + Vec2::angled(angle) * (radius * 0.65);
painter.line_segment( painter.line_segment(
[center, pointer], [center, pointer],
Stroke::new( Stroke::new(
self.config.stroke_width * 1.5, self.config.stroke_width * 1.2,
self.config.colors.line_color, self.config.colors.line_color,
), ),
); );
@@ -63,7 +70,7 @@ impl<'a> KnobRenderer<'a> {
let dot_pos = center + Vec2::angled(angle) * (radius * 0.7); let dot_pos = center + Vec2::angled(angle) * (radius * 0.7);
painter.circle_filled( painter.circle_filled(
dot_pos, dot_pos,
self.config.stroke_width * 1.5, self.config.stroke_width * 1.8,
self.config.colors.line_color, self.config.colors.line_color,
); );
} }
@@ -73,9 +80,9 @@ impl<'a> KnobRenderer<'a> {
fn render_background_arc(&self, painter: &Painter, center: Pos2, radius: f32) { fn render_background_arc(&self, painter: &Painter, center: Pos2, radius: f32) {
let arc_start = self.config.min_angle; let arc_start = self.config.min_angle;
let arc_end = self.config.max_angle; let arc_end = self.config.max_angle;
let segments = 64; let segments = 128;
let arc_color = self.config.colors.knob_color.gamma_multiply(0.5); let arc_color = self.config.colors.knob_color.gamma_multiply(0.35);
let arc_radius = radius * 0.8; let arc_radius = radius * 0.85;
let mut points = Vec::with_capacity(segments + 1); let mut points = Vec::with_capacity(segments + 1);
for i in 0..=segments { for i in 0..=segments {
@@ -95,6 +102,7 @@ impl<'a> KnobRenderer<'a> {
* ((self.value - self.min) / (self.max - self.min)).clamp(0.0, 1.0)) * ((self.value - self.min) / (self.max - self.min)).clamp(0.0, 1.0))
as usize; as usize;
if filled_segments > 0 {
let mut fill_points = Vec::with_capacity(filled_segments + 1); let mut fill_points = Vec::with_capacity(filled_segments + 1);
for i in 0..=filled_segments { for i in 0..=filled_segments {
let t = i as f32 / segments as f32; let t = i as f32 / segments as f32;
@@ -105,35 +113,36 @@ impl<'a> KnobRenderer<'a> {
painter.add(egui::Shape::line( painter.add(egui::Shape::line(
fill_points, fill_points,
Stroke::new(self.config.stroke_width, self.config.colors.line_color), Stroke::new(
self.config.stroke_width * 1.2,
self.config.colors.line_color,
),
)); ));
} }
} }
}
pub fn render_label(&self, ui: &Ui, rect: Rect) { pub fn render_label(&self, ui: &Ui, rect: Rect) {
if let Some(label) = &self.config.label { if let Some(label) = &self.config.label {
let label_text = format!("{}: {}", label, (self.config.label_format)(self.value)); let label_text = format!("{}: {}", label, (self.config.label_format)(self.value));
let font_id = egui::FontId::proportional(self.config.font_size); let font_id = egui::FontId::proportional(self.config.font_size);
let label_padding = 2.0; let label_padding = 4.0;
let (label_pos, alignment) = match self.config.label_position { let (label_pos, alignment) = match self.config.label_position {
LabelPosition::Top => ( LabelPosition::Top => (
Vec2::new( Vec2::new(rect.center().x, rect.min.y + label_padding),
rect.center().x,
rect.min.y - self.config.label_offset + label_padding,
),
Align2::CENTER_TOP, Align2::CENTER_TOP,
), ),
LabelPosition::Bottom => ( LabelPosition::Bottom => (
Vec2::new(rect.center().x, rect.max.y + self.config.label_offset), Vec2::new(rect.center().x, rect.max.y - label_padding),
Align2::CENTER_BOTTOM, Align2::CENTER_BOTTOM,
), ),
LabelPosition::Left => ( LabelPosition::Left => (
Vec2::new(rect.min.x - self.config.label_offset, rect.center().y), Vec2::new(rect.min.x + label_padding, rect.center().y),
Align2::LEFT_CENTER, Align2::LEFT_CENTER,
), ),
LabelPosition::Right => ( LabelPosition::Right => (
Vec2::new(rect.max.x + self.config.label_offset, rect.center().y), Vec2::new(rect.max.x - label_padding, rect.center().y),
Align2::RIGHT_CENTER, Align2::RIGHT_CENTER,
), ),
}; };
@@ -149,7 +158,7 @@ impl<'a> KnobRenderer<'a> {
} }
pub fn calculate_size(&self, ui: &Ui) -> Vec2 { pub fn calculate_size(&self, ui: &Ui) -> Vec2 {
let knob_size = Vec2::splat(self.config.size); let knob_size = Vec2::splat(self.config.size + self.config.stroke_width * 2.0);
let label_size = if let Some(label) = &self.config.label { let label_size = if let Some(label) = &self.config.label {
let font_id = egui::FontId::proportional(self.config.font_size); let font_id = egui::FontId::proportional(self.config.font_size);
@@ -161,16 +170,16 @@ impl<'a> KnobRenderer<'a> {
Vec2::ZERO Vec2::ZERO
}; };
let label_padding = 2.0; let label_padding = 8.0;
match self.config.label_position { match self.config.label_position {
LabelPosition::Top | LabelPosition::Bottom => Vec2::new( LabelPosition::Top | LabelPosition::Bottom => Vec2::new(
knob_size.x.max(label_size.x + label_padding * 2.0), knob_size.x.max(label_size.x + label_padding * 2.0),
knob_size.y + label_size.y + label_padding * 2.0 + self.config.label_offset, knob_size.y + label_size.y + label_padding + self.config.label_offset,
), ),
LabelPosition::Left | LabelPosition::Right => Vec2::new( LabelPosition::Left | LabelPosition::Right => Vec2::new(
knob_size.x + label_size.x + label_padding * 2.0 + self.config.label_offset, knob_size.x + label_size.x + label_padding + self.config.label_offset,
knob_size.y.max(label_size.y + label_padding * 2.0), knob_size.y.max(label_size.y + label_padding),
), ),
} }
} }