From 2e774645c66fba9e8dd8faa90a8e6edc73349e99 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Wed, 7 Aug 2024 14:28:59 -0700 Subject: [PATCH] Update to new minor version 0.28 Fixed clippy lint rules --- Cargo.toml | 13 ++++++------- src/lib.rs | 8 ++------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 154a4d4..1f19118 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ nord = [] tokyo_night = [] [dependencies] -egui = "0.27" +egui = "0.28" [lib] name = "egui_aesthetix" @@ -43,12 +43,11 @@ unsafe_code = "forbid" [lints.clippy] # Deny rules -all = "deny" -perf = "deny" -correctness = "deny" -complexity = "deny" -style = "deny" -pedantic = "deny" +perf = { level = "deny", priority = -1 } +style = { level = "deny", priority = -1 } +pedantic = { level = "deny", priority = -1 } +correctness = { level = "deny", priority = -1 } +complexity = { level = "deny", priority = -1 } as_underscore = "deny" assertions_on_result_states = "deny" clone_on_ref_ptr = "deny" diff --git a/src/lib.rs b/src/lib.rs index e0a0194..be90c0f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -9,8 +9,6 @@ #[cfg(feature = "default")] pub mod themes; -use egui::style::ScrollStyle; - /// Every custom egui theme that wishes to use the egui aesthetix crate must implement this trait. /// Aesthetix is structured in such a way that it is easy to customize the theme to your liking. /// @@ -141,7 +139,7 @@ pub trait Aesthetix { tooltip_width: 600.0, indent_ends_with_horizontal_line: false, combo_height: 200.0, - scroll: ScrollStyle { + scroll: egui::style::ScrollStyle { bar_width: self.scroll_bar_width_style(), handle_min_length: 12.0, bar_inner_margin: 4.0, @@ -334,13 +332,12 @@ pub trait Aesthetix { text_styles: self.custom_text_styles(), // set your drag value text style: - // drag_value_text_style: egui::TextStyle, spacing: self.spacing_style(), interaction: self.interaction_style(), visuals: egui::Visuals { dark_mode: self.dark_mode_visuals(), - //override_text_color: self.fg_primary_text_color_visuals(), + override_text_color: self.fg_primary_text_color_visuals(), widgets: egui::style::Widgets { noninteractive: self.custom_noninteractive_widget_visuals(), inactive: self.widget_inactive_visual(), @@ -384,7 +381,6 @@ pub trait Aesthetix { ..Default::default() }, resize_corner_size: 12.0, - text_cursor_preview: false, clip_rect_margin: 3.0, button_frame: true, collapsing_header_frame: true,