diff --git a/Cargo.toml b/Cargo.toml index ba5479c..19d965d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,8 +35,10 @@ dirs = "5.0.1" #-------------------------------------------------------------------------------- egui = "0.24.1" egui_extras = { version = "0.24.1", features = ["image"] } +## 2023-12-28: https://github.com/hinto-janai/gupax/issues/68 +eframe = { version = "0.24.1", default-features = false, features = ["glow"] } -## Update 2023-Feb-06: The below gets fixed by using the [wgpu] backend instead of [glow] +## 2023-02-06: The below gets fixed by using the [wgpu] backend instead of [glow] ## It also fixes crashes on CPU-based graphics. Only used for Windows. ## Using [wgpu] actually crashes macOS (fixed in 0.20.x though). @@ -78,8 +80,6 @@ strsim = "0.10.0" tar = "0.4.38" flate2 = "1.0" sudo = "0.6.0" -## [glow] backend for macOS/Linux. -eframe = { version = "0.24.1", default-features = false, features = ["glow"] } # macOS [target.'cfg(target_os = "macos")'.dependencies] @@ -104,7 +104,6 @@ tls-api-native-tls = "0.9.0" [target.'cfg(windows)'.dependencies] zip = "0.6.6" is_elevated = "0.1.2" -eframe = { version = "0.24.1", default-features = false, features = ["glow"] } # For Windows build (icon) [target.'cfg(windows)'.build-dependencies] diff --git a/src/constants.rs b/src/constants.rs index c67c589..9a5639c 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -434,7 +434,7 @@ pub static VISUALS: Lazy = Lazy::new(|| { fg_stroke: Stroke::new(1.0, Color32::from_gray(140)), // normal text color rounding: Rounding::same(10.0), expansion: 0.0, - weak_bg_fill: Color32::from_gray(27), + weak_bg_fill: BG, }, inactive: WidgetVisuals { bg_fill: Color32::from_gray(50), @@ -442,7 +442,7 @@ pub static VISUALS: Lazy = Lazy::new(|| { fg_stroke: Stroke::new(1.0, Color32::from_gray(180)), // button text rounding: Rounding::same(10.0), expansion: 0.0, - weak_bg_fill: Color32::from_gray(27), + weak_bg_fill: Color32::from_gray(50), }, hovered: WidgetVisuals { bg_fill: Color32::from_gray(80), @@ -450,7 +450,7 @@ pub static VISUALS: Lazy = Lazy::new(|| { fg_stroke: Stroke::new(1.5, Color32::from_gray(240)), rounding: Rounding::same(10.0), expansion: 1.0, - weak_bg_fill: Color32::from_gray(27), + weak_bg_fill: Color32::from_gray(80), }, active: WidgetVisuals { bg_fill: Color32::from_gray(55), @@ -458,7 +458,7 @@ pub static VISUALS: Lazy = Lazy::new(|| { fg_stroke: Stroke::new(2.0, Color32::WHITE), rounding: Rounding::same(10.0), expansion: 1.0, - weak_bg_fill: Color32::from_gray(27), + weak_bg_fill: Color32::from_gray(120), }, open: WidgetVisuals { bg_fill: Color32::from_gray(27), @@ -466,7 +466,7 @@ pub static VISUALS: Lazy = Lazy::new(|| { fg_stroke: Stroke::new(1.0, Color32::from_gray(210)), rounding: Rounding::same(10.0), expansion: 0.0, - weak_bg_fill: Color32::from_gray(27), + weak_bg_fill: Color32::from_gray(120), }, };