GUI/grim
1
1
Fork 0
Code Issues 6 Pull requests Projects Releases 8 Packages Wiki Activity Actions

Open .slatepack file with the app #13

Merged
ardocrat merged 28 commits from slatepack_ext_file into master 2024-09-16 19:08:27 +03:00
Conversation 0 Commits 28 Files changed 60 +28 -13
2 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit fb7312cb80 - Show all commits

17
src/gui/app.rs
View file

@ -33,12 +33,17 @@ lazy_static! {
pub struct App<Platform> { pub struct App<Platform> {
/// Platform specific callbacks handler. /// Platform specific callbacks handler.
pub platform: Platform, pub platform: Platform,
/// Main content. /// Main content.
content: Content, content: Content,
/// Last window resize direction. /// Last window resize direction.
resize_direction: Option<ResizeDirection>, resize_direction: Option<ResizeDirection>,
/// Flag to check if it's first draw. /// Flag to check if it's first draw.
first_draw: bool, first_draw: bool,
/// Flag to check if attention required after window focus.
attention_required: bool,
} }
impl<Platform: PlatformCallbacks> App<Platform> { impl<Platform: PlatformCallbacks> App<Platform> {
@ -48,6 +53,7 @@ impl<Platform: PlatformCallbacks> App<Platform> {
content: Content::default(), content: Content::default(),
resize_direction: None, resize_direction: None,
first_draw: true, first_draw: true,
attention_required: false,
} }
} }
@ -109,8 +115,19 @@ impl<Platform: PlatformCallbacks> App<Platform> {
// Provide incoming data to wallets. // Provide incoming data to wallets.
if let Some(data) = self.platform.consume_data() { if let Some(data) = self.platform.consume_data() {
self.content.wallets.on_data(ui, Some(data), &self.platform); self.content.wallets.on_data(ui, Some(data), &self.platform);
self.attention_required = true;
} }
}); });
// Check if desktop window was focused after requested attention.
if View::is_desktop() && self.attention_required
&& ctx.input(|i| i.viewport().focused.unwrap_or(true)) {
self.attention_required = false;
ctx.send_viewport_cmd(
ViewportCommand::RequestUserAttention(egui::UserAttentionType::Reset)
);
ctx.send_viewport_cmd(ViewportCommand::WindowLevel(egui::WindowLevel::Normal));
}
} }
/// Draw custom resizeable window content. /// Draw custom resizeable window content.

24
src/gui/platform/desktop/mod.rs
View file

@ -19,7 +19,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc; use std::sync::Arc;
use parking_lot::RwLock; use parking_lot::RwLock;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use egui::{UserAttentionType, ViewportCommand}; use egui::{UserAttentionType, ViewportCommand, WindowLevel};
use rfd::FileDialog; use rfd::FileDialog;
use crate::gui::platform::PlatformCallbacks; use crate::gui::platform::PlatformCallbacks;
@ -126,14 +126,6 @@ impl PlatformCallbacks for Desktop {
r_data.is_some() r_data.is_some()
}; };
if has_data { if has_data {
// Reset window state.
let r_ctx = self.ctx.read();
if r_ctx.is_some() {
let ctx = r_ctx.as_ref().unwrap();
ctx.send_viewport_cmd(
ViewportCommand::RequestUserAttention(UserAttentionType::Reset)
);
}
// Clear data. // Clear data.
let mut w_data = PASSED_DATA.write(); let mut w_data = PASSED_DATA.write();
let data = w_data.clone(); let data = w_data.clone();
@ -160,16 +152,22 @@ impl Desktop {
let mut w_data = PASSED_DATA.write(); let mut w_data = PASSED_DATA.write();
*w_data = Some(data); *w_data = Some(data);
// Bring focus on window.
let r_ctx = self.ctx.read(); let r_ctx = self.ctx.read();
if r_ctx.is_some() { if r_ctx.is_some() {
let ctx = r_ctx.as_ref().unwrap(); let ctx = r_ctx.as_ref().unwrap();
ctx.send_viewport_cmd(ViewportCommand::Visible(true)); // Request attention on taskbar.
ctx.send_viewport_cmd(ViewportCommand::Minimized(false));
ctx.send_viewport_cmd( ctx.send_viewport_cmd(
ViewportCommand::RequestUserAttention(UserAttentionType::Informational) ViewportCommand::RequestUserAttention(UserAttentionType::Informational)
); );
ctx.send_viewport_cmd(ViewportCommand::Focus); // Un-minimize window.
if ctx.input(|i| i.viewport().minimized.unwrap_or(false)) {
ctx.send_viewport_cmd(ViewportCommand::Minimized(false));
}
// Focus to window.
if !ctx.input(|i| i.viewport().focused.unwrap_or(false)) {
ctx.send_viewport_cmd(ViewportCommand::WindowLevel(WindowLevel::AlwaysOnTop));
ctx.send_viewport_cmd(ViewportCommand::Focus);
}
ctx.request_repaint(); ctx.request_repaint();
} }
} }