11 Commits

Author SHA1 Message Date
fb3f9d75dc updated cargo.lock 2026-01-13 23:41:33 +03:00
45ce317879 bump version 2026-01-13 23:39:41 +03:00
15021b8cfa Merge pull request #7 from maor1993/master
Support for using mouse scroll wheel to change values
2026-01-13 23:36:37 +03:00
Maor Malka
ad468ae18a Merge branch 'feature/scroll' 2026-01-13 05:58:41 -05:00
Maor Malka
2c5b209571 added support for using scroll wheel to modify knob value 2026-01-13 05:57:30 -05:00
c1db9a2e5b ci: added publish action 2026-01-12 09:29:07 +03:00
750d8afb25 Merge pull request #6 from maor1993/master
added support for double click reset to a known value
2026-01-12 09:09:02 +03:00
4e8975c955 Updated doc comment for with_double_click_reset 2026-01-12 09:06:25 +03:00
Maor Malka
824b492b92 added support for double click reset to a known value 2026-01-11 18:58:20 -05:00
a70b57e62b expose egui types #5 2026-01-06 01:55:10 +03:00
a2a102cdb6 nit: cleaned up ui a bit 2025-11-21 01:03:52 +03:00
11 changed files with 136 additions and 42 deletions

27
.github/workflows/publish.yml vendored Normal file
View File

@@ -0,0 +1,27 @@
name: Publish to crates.io
on:
push:
tags:
- 'v*'
jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
- name: Check if version matches tag
run: |
TAG=${GITHUB_REF#refs/tags/v}
CARGO_VERSION=$(grep '^version' Cargo.toml | head -1 | cut -d'"' -f2)
if [ "$TAG" != "$CARGO_VERSION" ]; then
echo "Tag version ($TAG) doesn't match Cargo.toml version ($CARGO_VERSION)"
exit 1
fi
- name: Publish to crates.io
run: cargo publish --token ${{ secrets.CARGO_REGISTRY_TOKEN }}

View File

@@ -2,6 +2,30 @@
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.9] - 2026-01-13
### 🚀 Features
- added support for using mouse scroll wheel to change values ([#PR7](https://github.com/obsqrbtz/egui_knob/pull/7) by [maor1993](https://github.com/maor1993))
## [0.3.8] - 2026-01-12
### 🚀 Features
- added `with_double_click_reset` option ([#PR6](https://github.com/obsqrbtz/egui_knob/pull/6) by [maor1993](https://github.com/maor1993))
## [0.3.7] - 2026-01-06
### 🛠 Maintenance
- expose egui types
## [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.9"
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.9"
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.9"
``` ```
## 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,13 +82,14 @@ 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)
.with_show_filled_segments(self.show_filled) .with_show_filled_segments(self.show_filled)
.with_colors(self.knob_color, self.line_color, self.text_color) .with_colors(self.knob_color, self.line_color, self.text_color)
.with_step(self.use_step.then_some(0.02)); .with_step(self.use_step.then_some(0.02))
.with_double_click_reset(0.5)
.with_middle_scroll();
if *label == "Wiper, Sweep" { if *label == "Wiper, Sweep" {
knob = knob.with_sweep_range(0.25, 0.75).with_size(50.0); knob = knob.with_sweep_range(0.25, 0.75).with_size(50.0);

BIN
scrot.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 42 KiB

View File

@@ -16,6 +16,8 @@ pub struct KnobConfig {
pub(crate) show_filled_segments: bool, pub(crate) show_filled_segments: bool,
pub(crate) min_angle: f32, pub(crate) min_angle: f32,
pub(crate) max_angle: f32, pub(crate) max_angle: f32,
pub(crate) reset_value: Option<f32>,
pub(crate) allow_scroll: bool,
} }
impl KnobConfig { impl KnobConfig {
@@ -36,6 +38,8 @@ impl KnobConfig {
drag_sensitivity: 0.005, drag_sensitivity: 0.005,
show_background_arc: true, show_background_arc: true,
show_filled_segments: true, show_filled_segments: true,
reset_value: None,
allow_scroll:false
} }
} }
} }

View File

@@ -3,5 +3,7 @@ mod render;
mod style; mod style;
mod widget; mod widget;
pub use egui;
pub use style::{KnobStyle, LabelPosition}; pub use style::{KnobStyle, LabelPosition};
pub use widget::Knob; pub use widget::Knob;

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,18 +102,23 @@ 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;
let mut fill_points = Vec::with_capacity(filled_segments + 1); if filled_segments > 0 {
for i in 0..=filled_segments { let mut fill_points = Vec::with_capacity(filled_segments + 1);
let t = i as f32 / segments as f32; for i in 0..=filled_segments {
let angle = arc_start + (arc_end - arc_start) * t; let t = i as f32 / segments as f32;
let pos = center + Vec2::angled(angle) * arc_radius; let angle = arc_start + (arc_end - arc_start) * t;
fill_points.push(pos); let pos = center + Vec2::angled(angle) * arc_radius;
} fill_points.push(pos);
}
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,
),
));
}
} }
} }
@@ -114,26 +126,23 @@ impl<'a> KnobRenderer<'a> {
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),
), ),
} }
} }

View File

@@ -53,7 +53,7 @@ impl<'a> Knob<'a> {
return self; return self;
} }
self.config.min_angle = self.config.min_angle =
start_angle_normalized.rem_euclid(1.0) * std::f32::consts::TAU + std::f32::consts::PI / 2.0; start_angle_normalized.rem_euclid(1.0) * std::f32::consts::TAU + std::f32::consts::PI / 2.0;
self.config.max_angle = self.config.min_angle + range.max(0.0) * std::f32::consts::TAU; self.config.max_angle = self.config.min_angle + range.max(0.0) * std::f32::consts::TAU;
self self
@@ -156,6 +156,18 @@ impl<'a> Knob<'a> {
self self
} }
/// Sets a reset value to return to on doubleclick event.
pub fn with_double_click_reset(mut self, reset_value: f32) -> Self {
self.config.reset_value = Some(reset_value);
self
}
/// Allows user to use scroll wheel to change knob value
/// Uses config.step for the increment value
pub fn with_middle_scroll(mut self) -> Self {
self.config.allow_scroll = true;
self
}
} }
impl Widget for Knob<'_> { impl Widget for Knob<'_> {
@@ -168,7 +180,7 @@ impl Widget for Knob<'_> {
let renderer = KnobRenderer::new(&self.config, current_value, self.min, self.max); let renderer = KnobRenderer::new(&self.config, current_value, self.min, self.max);
let adjusted_size = renderer.calculate_size(ui); let adjusted_size = renderer.calculate_size(ui);
let (rect, response) = ui.allocate_exact_size(adjusted_size, Sense::drag()); let (rect, response) = ui.allocate_exact_size(adjusted_size, Sense::click_and_drag());
let mut response = response; let mut response = response;
if response.dragged() { if response.dragged() {
@@ -189,6 +201,21 @@ impl Widget for Knob<'_> {
} }
response.mark_changed(); response.mark_changed();
} else if response.double_clicked() {
if let Some(reset_value) = self.config.reset_value {
*self.value = reset_value
}
} else if response.hovered() & self.config.allow_scroll {
if let Some(scoll) = ui.input(|input| {
input.events.iter().find_map(|e| match e {
egui::Event::MouseWheel { delta, .. } => Some(*delta),
_ => None,
})
}) {
*self.value = (*self.value
+ scoll.y * self.config.step.unwrap_or(self.config.drag_sensitivity))
.clamp(self.min, self.max);
}
} }
let knob_rect = renderer.calculate_knob_rect(rect); let knob_rect = renderer.calculate_knob_rect(rect);