diff --git a/CHANGELOG.md b/CHANGELOG.md index 084b3255..9d9c6bfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [v5.0.7] ### Changed - Fix to suspend process in anime thread to let custom anims run on wake. - Fix to reload the fan curves correctly on boot. - Add new config option `platform_policy_linked_epp` to set if energy_performance_preference should be paired with platform_profile/throttle_thermal_policy +- Small fixes to rog-control-center ## [v5.0.6] - Revert egui update due to a lot of issues arising from window closing. diff --git a/Cargo.lock b/Cargo.lock index 3775e2e5..b8840ff7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -199,7 +199,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asusctl" -version = "5.0.6" +version = "5.0.7" dependencies = [ "asusd", "cargo-husky", @@ -218,7 +218,7 @@ dependencies = [ [[package]] name = "asusd" -version = "5.0.6" +version = "5.0.7" dependencies = [ "async-trait", "cargo-husky", @@ -226,7 +226,7 @@ dependencies = [ "config-traits", "dmi_id", "env_logger", - "futures-lite 2.1.0", + "futures-lite 1.13.0", "log", "logind-zbus", "rog_anime", @@ -243,7 +243,7 @@ dependencies = [ [[package]] name = "asusd-user" -version = "5.0.6" +version = "5.0.7" dependencies = [ "cargo-husky", "config-traits", @@ -846,7 +846,7 @@ dependencies = [ [[package]] name = "config-traits" -version = "5.0.6" +version = "5.0.7" dependencies = [ "cargo-husky", "log", @@ -899,7 +899,7 @@ dependencies = [ [[package]] name = "cpuctl" -version = "5.0.6" +version = "5.0.7" [[package]] name = "cpufeatures" @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "dmi_id" -version = "5.0.6" +version = "5.0.7" dependencies = [ "log", "udev", @@ -2836,7 +2836,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rog-control-center" -version = "5.0.6" +version = "5.0.7" dependencies = [ "asusd", "cargo-husky", @@ -2869,7 +2869,7 @@ dependencies = [ [[package]] name = "rog_anime" -version = "5.0.6" +version = "5.0.7" dependencies = [ "cargo-husky", "dmi_id", @@ -2886,7 +2886,7 @@ dependencies = [ [[package]] name = "rog_aura" -version = "5.0.6" +version = "5.0.7" dependencies = [ "cargo-husky", "dmi_id", @@ -2900,7 +2900,7 @@ dependencies = [ [[package]] name = "rog_dbus" -version = "5.0.6" +version = "5.0.7" dependencies = [ "asusd", "cargo-husky", @@ -2913,7 +2913,7 @@ dependencies = [ [[package]] name = "rog_platform" -version = "5.0.6" +version = "5.0.7" dependencies = [ "cargo-husky", "concat-idents", @@ -2930,7 +2930,7 @@ dependencies = [ [[package]] name = "rog_profiles" -version = "5.0.6" +version = "5.0.7" dependencies = [ "cargo-husky", "log", @@ -2944,7 +2944,7 @@ dependencies = [ [[package]] name = "rog_simulators" -version = "5.0.6" +version = "5.0.7" dependencies = [ "glam", "log", diff --git a/Cargo.toml b/Cargo.toml index b8585f1f..645424c1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["asusctl", "asusd", "asusd-user", "cpuctl", "rog-control-cent resolver = "2" [workspace.package] -version = "5.0.6" +version = "5.0.7" [workspace.dependencies] async-trait = "^0.1" diff --git a/rog-control-center/src/main.rs b/rog-control-center/src/main.rs index bff5fdda..447f3edd 100644 --- a/rog-control-center/src/main.rs +++ b/rog-control-center/src/main.rs @@ -62,8 +62,8 @@ fn main() -> Result<()> { let native_options = eframe::NativeOptions { vsync: true, hardware_acceleration: HardwareAcceleration::Preferred, - // min_window_size: Some(egui::vec2(960.0, 670.0)), - // max_window_size: Some(egui::vec2(960.0, 670.0)), + min_window_size: Some(egui::vec2(980.0, 670.0)), + max_window_size: Some(egui::vec2(980.0, 670.0)), run_and_return: true, ..Default::default() }; @@ -186,6 +186,13 @@ fn main() -> Result<()> { &config, )?; + if cli_parsed.board_name.is_some() || cli_parsed.layout_viewing { + if let Ok(mut lock) = states.lock() { + lock.run_in_bg = false; + running_in_bg.store(false, Ordering::Release); + } + } + if config.enable_tray_icon { init_tray(supported_properties, states.clone()); } @@ -212,7 +219,7 @@ fn main() -> Result<()> { } if let Ok(lock) = states.try_lock() { - if !lock.run_in_bg || cli_parsed.board_name.is_some() || cli_parsed.layout_viewing { + if !lock.run_in_bg { break; } diff --git a/rog-control-center/src/pages/mod.rs b/rog-control-center/src/pages/mod.rs index 73516a9e..fb0aac82 100644 --- a/rog-control-center/src/pages/mod.rs +++ b/rog-control-center/src/pages/mod.rs @@ -3,9 +3,3 @@ mod app_settings; mod aura_page; mod fan_curve_page; mod system_page; - -pub use anime_page::*; -pub use app_settings::*; -pub use aura_page::*; -pub use fan_curve_page::*; -pub use system_page::*; diff --git a/rog-control-center/src/widgets/mod.rs b/rog-control-center/src/widgets/mod.rs index c380131f..70dc643c 100644 --- a/rog-control-center/src/widgets/mod.rs +++ b/rog-control-center/src/widgets/mod.rs @@ -15,5 +15,3 @@ pub use aura_power::*; pub use fan_graph::*; pub use keyboard_layout::*; pub use rog_bios::*; -pub use side_panel::*; -pub use top_bar::*; diff --git a/rog-control-center/src/widgets/top_bar.rs b/rog-control-center/src/widgets/top_bar.rs index 43cf36d4..72b2fff3 100644 --- a/rog-control-center/src/widgets/top_bar.rs +++ b/rog-control-center/src/widgets/top_bar.rs @@ -1,4 +1,4 @@ -use egui::{vec2, Align2, FontId, Id, Sense}; +use egui::{vec2, Align2, Button, FontId, Id, Rect, RichText, Sense, Vec2}; use crate::{RogApp, VERSION}; @@ -33,15 +33,14 @@ impl RogApp { FontId::proportional(height - 2.0), text_color, ); - // // Add the close button: - // let close_response = ui.put( - // Rect::from_min_size(titlebar_rect.right_top(), - // Vec2::splat(height)), - // Button::new(RichText::new("❌").size(height - - // 4.0)).frame(false), ); - // if close_response.clicked() { - // frame.close(); - // } + // Add the close button: + let close_response = ui.put( + Rect::from_min_size(titlebar_rect.right_top(), Vec2::splat(height)), + Button::new(RichText::new("❌").size(height - 4.0)).frame(false), + ); + if close_response.clicked() { + frame.close(); + } }); }); }