obsqrbtz/egui_knob
1
0
Fork 0
mirror of https://github.com/obsqrbtz/egui_knob.git synced 2026-04-08 20:19:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from elwerene/update_egui

Browse Source 
update egui and fix clippy warnings
This commit is contained in:
Daniel Dada
2026-03-30 10:08:26 +03:00
committed by GitHub
parent fa7dd9e181 353dcd8cc4
commit d20180729a
4 changed files with 551 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

722
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
Cargo.toml
View File

@@ -21,7 +21,7 @@ name = "example_knob"
path = "examples/example_knob.rs" path = "examples/example_knob.rs"
[dependencies] [dependencies]
egui = "0.33" egui = "0.34"
[dev-dependencies] [dev-dependencies]
eframe = { version = "0.33", features = ["default_fonts"] } eframe = { version = "0.34", features = ["default_fonts"] }

5
examples/example_knob.rs
View File

@@ -43,8 +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 ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
egui::CentralPanel::default().show(ctx, |ui| {
ui.heading("Knob demo"); ui.heading("Knob demo");
ui.separator(); ui.separator();
@@ -54,7 +53,6 @@ impl eframe::App for KnobDemo {
ui.checkbox(&mut self.show_filled, "Filled segment"); ui.checkbox(&mut self.show_filled, "Filled segment");
ui.checkbox(&mut self.use_step, "Step (0.02)"); ui.checkbox(&mut self.use_step, "Step (0.02)");
ui.checkbox(&mut self.logarithmic_scaling, "Logarithmic"); ui.checkbox(&mut self.logarithmic_scaling, "Logarithmic");
}); });
ui.horizontal(|ui| { ui.horizontal(|ui| {
@@ -126,6 +124,5 @@ impl eframe::App for KnobDemo {
ui.add_space(10.0); ui.add_space(10.0);
ui.separator(); ui.separator();
});
} }
} }

9
src/widget.rs
View File

@@ -209,8 +209,7 @@ impl Widget for Knob<'_> {
} }
response.mark_changed(); response.mark_changed();
} else if response.hovered() & self.config.allow_scroll { } else if response.hovered() & self.config.allow_scroll && let Some(scoll) = ui.input(|input| {
if let Some(scoll) = ui.input(|input| {
input.events.iter().find_map(|e| match e { input.events.iter().find_map(|e| match e {
egui::Event::MouseWheel { delta, .. } => Some(*delta), egui::Event::MouseWheel { delta, .. } => Some(*delta),
_ => None, _ => None,
@@ -220,7 +219,6 @@ impl Widget for Knob<'_> {
+ scoll.y * self.config.step.unwrap_or(self.config.drag_sensitivity)) + scoll.y * self.config.step.unwrap_or(self.config.drag_sensitivity))
.clamp(0.0, 1.0); .clamp(0.0, 1.0);
} }
}
*self.value = if self.config.logarithmic_scaling { *self.value = if self.config.logarithmic_scaling {
remap(10f32.powf(raw), 1.0..=10.0, self.min..=self.max) remap(10f32.powf(raw), 1.0..=10.0, self.min..=self.max)
@@ -228,11 +226,10 @@ impl Widget for Knob<'_> {
remap(raw, 0.0..=1.0, self.min..=self.max) remap(raw, 0.0..=1.0, self.min..=self.max)
}; };
if response.double_clicked() { if response.double_clicked()
if let Some(reset_value) = self.config.reset_value { && let Some(reset_value) = self.config.reset_value {
*self.value = reset_value *self.value = reset_value
} }
}
let knob_rect = renderer.calculate_knob_rect(rect); let knob_rect = renderer.calculate_knob_rect(rect);
let center = knob_rect.center(); let center = knob_rect.center();