zeldon
/
razer-battery-report
mirror of https://github.com/xzeldon/razer-battery-report.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "chore: bump version (v0.2.2)" 

This reverts commit 46af703f1d.
This commit is contained in:
Timofey Gelazoniya 2024-09-06 04:06:18 +03:00
parent 2c8e4da552
commit c5b4f7c51e
Signed by: zeldon
GPG Key ID: 047886915281DD2A
3 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1813,7 +1813,7 @@ dependencies = [
[[package]] [[package]]
name = "razer-battery-report" name = "razer-battery-report"
version = "0.2.2" version = "0.2.1"
dependencies = [ dependencies = [
"hidapi", "hidapi",
"image", "image",

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "razer-battery-report" name = "razer-battery-report"
version = "0.2.2" version = "0.2.1"
authors = ["xzeldon <contact@zeldon.ru>"] authors = ["xzeldon <contact@zeldon.ru>"]
edition = "2021" edition = "2021"
description = "Razer Battery Level Tray Indicator" description = "Razer Battery Level Tray Indicator"

72
src/tray.rs
View File

@ -3,7 +3,6 @@ use std::{
rc::Rc, rc::Rc,
sync::{mpsc, Arc, Mutex}, sync::{mpsc, Arc, Mutex},
thread, thread,
time::{Duration, Instant},
}; };
use crate::manager::DeviceManager; use crate::manager::DeviceManager;
@ -15,7 +14,7 @@ use tray_icon::{
}; };
use winapi::um::{ use winapi::um::{
wincon::GetConsoleWindow, wincon::GetConsoleWindow,
winuser::{self, ShowWindow}, winuser::{self, ShowWindow, SW_SHOW},
}; };
const BATTERY_UPDATE_INTERVAL: Duration = Duration::from_secs(60); const BATTERY_UPDATE_INTERVAL: Duration = Duration::from_secs(60);
@ -194,53 +193,46 @@ impl TrayApp {
let menu_channel = MenuEvent::receiver(); let menu_channel = MenuEvent::receiver();
let mut last_update = Instant::now();
let update_interval = Duration::from_millis(100);
event_loop.run(move |event, _, control_flow| { event_loop.run(move |event, _, control_flow| {
*control_flow = tao::event_loop::ControlFlow::Wait; *control_flow = tao::event_loop::ControlFlow::WaitUntil(
std::time::Instant::now() + std::time::Duration::from_millis(100),
);
match event { if let Ok(device_ids) = rx.try_recv() {
tao::event::Event::NewEvents(tao::event::StartCause::Init) => { Self::update(&devices, &device_manager, &device_ids, &tray_icon);
TrayInner::build_tray(&tray_icon, &tray_menu, icon.clone()); }
}
tao::event::Event::MainEventsCleared => {
// Check if it's time to process updates
if last_update.elapsed() >= update_interval {
while let Ok(device_ids) = rx.try_recv() {
Self::update(&devices, &device_manager, &device_ids, &tray_icon);
}
while let Ok(event) = menu_channel.try_recv() { if let tao::event::Event::NewEvents(tao::event::StartCause::Init) = event {
let menu_items = menu_items.lock().unwrap(); // We create the icon once the event loop is actually running
let show_console_item = &menu_items[0]; // to prevent issues like https://github.com/tauri-apps/tray-icon/issues/90
let quit_item = &menu_items[1]; TrayInner::build_tray(&tray_icon, &tray_menu, icon.clone());
}
if event.id == show_console_item.id() { if let Ok(event) = menu_channel.try_recv() {
let mut visible = console_state.lock().unwrap(); let menu_items = menu_items.lock().unwrap();
*visible = !*visible;
if *visible { let show_console_item = &menu_items[0];
unsafe { ShowWindow(GetConsoleWindow(), winuser::SW_SHOW) }; let quit_item = &menu_items[1];
show_console_item.set_text("Hide Log Window");
trace!("showing log window");
} else {
unsafe { ShowWindow(GetConsoleWindow(), winuser::SW_HIDE) };
show_console_item.set_text("Show Log Window");
trace!("hiding log window");
}
}
if event.id == quit_item.id() { if event.id == show_console_item.id() {
*control_flow = tao::event_loop::ControlFlow::Exit; let mut visible = console_state.lock().unwrap();
return;
}
}
last_update = Instant::now(); if *visible {
unsafe { ShowWindow(GetConsoleWindow(), winuser::SW_HIDE) };
show_console_item.set_text("Show Log Window");
trace!("hiding log window");
*visible = false;
} else {
unsafe { ShowWindow(GetConsoleWindow(), SW_SHOW) };
show_console_item.set_text("Hide Log Window");
trace!("showing log window");
*visible = true
} }
} }
_ => (),
if event.id == quit_item.id() {
*control_flow = tao::event_loop::ControlFlow::Exit;
}
} }
}); });
} }