Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ pub enum Message {
ClearSearchResults,
WindowFocusChanged(Id, bool),
ClearSearchQuery,
HideTrayIcon,
ReloadConfig,
SetSender(ExtSender),
SwitchToPage(Page),
Expand Down
9 changes: 9 additions & 0 deletions src/app/menubar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ pub fn menu_icon(hotkey: (Option<Modifiers>, Code), hotkey_id: u32, sender: ExtS
&get_help_item(),
&PredefinedMenuItem::separator(),
&open_settings_item(),
&hide_tray_icon(),
&quit_item(),
])
.unwrap();
Expand Down Expand Up @@ -71,6 +72,10 @@ fn init_event_handler(sender: ExtSender, hotkey_id: u32) {
sender.clone().try_send(Message::ReloadConfig).unwrap();
});
}
"hide_tray_icon" => {
runtime
.spawn(async move { sender.clone().try_send(Message::HideTrayIcon).unwrap() });
}
"open_issue_page" => {
open_url("https://github.com/unsecretised/rustcast/issues/new");
}
Expand Down Expand Up @@ -101,6 +106,10 @@ fn version_item() -> MenuItem {
MenuItem::new(version, false, None)
}

fn hide_tray_icon() -> MenuItem {
MenuItem::with_id("hide_tray_icon", "Hide Tray Icon", true, None)
}

fn open_item(hotkey: (Option<Modifiers>, Code)) -> MenuItem {
MenuItem::with_id(
"show_rustcast",
Expand Down
24 changes: 19 additions & 5 deletions src/app/tile/update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
use std::cmp::min;
use std::fs;
use std::path::Path;
use std::thread;
use std::time::Duration;

use global_hotkey::hotkey::HotKey;
Expand Down Expand Up @@ -44,6 +45,14 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
tile.visible = true;
Task::none()
}
Message::HideTrayIcon => {
tile.tray_icon = None;
tile.config.show_trayicon = false;
let home = std::env::var("HOME").unwrap();
let confg_str = toml::to_string(&tile.config).unwrap();
thread::spawn(move || fs::write(home + "/.config/rustcast/config.toml", confg_str));
Task::none()
}

Message::SetSender(sender) => {
tile.sender = Some(sender.clone());
Expand Down Expand Up @@ -203,12 +212,17 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {

Message::ChangeFocus(key) => {
let u32_len = tile.results.len() as u32;
match key {
ArrowKey::ArrowDown => tile.focus_id = (tile.focus_id + 1) % u32_len,
ArrowKey::ArrowUp => tile.focus_id = (tile.focus_id + u32_len - 1) % u32_len,
_ => {}
if u32_len > 0 {
match key {
ArrowKey::ArrowDown => tile.focus_id = (tile.focus_id + 1) % u32_len,
ArrowKey::ArrowUp => tile.focus_id = (tile.focus_id + u32_len - 1) % u32_len,
_ => {}
}

operation::focus(format!("result-{}", tile.focus_id))
} else {
Task::none()
}
operation::focus(format!("result-{}", tile.focus_id))
}

Message::OpenFocused => match tile.results.get(tile.focus_id as usize) {
Expand Down