MeexReay/bRAC
1
0
Fork 0
mirror of https://github.com/MeexReay/bRAC.git synced 2025-05-06 13:38:04 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

some optimizations

Browse Source
This commit is contained in:
MeexReay 2025-04-21 01:18:20 +03:00
parent cc01dd1e49
commit 015d8fca59
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -17,8 +17,8 @@ chrono = "0.4.40"
serde_default = "0.2.0" serde_default = "0.2.0"
socks = "0.3.4" socks = "0.3.4"
libnotify = { version = "1.0.3", optional = true } libnotify = { version = "1.0.3", optional = true }
gdk-pixbuf = "0.3.0" gdk-pixbuf = { version = "0.3.0", optional = true }
[features] [features]
default = ["libnotify"] default = ["libnotify"]
libnotify = ["dep:libnotify"] libnotify = ["dep:libnotify", "dep:gdk-pixbuf"]

20
src/chat/gui.rs
View File

@ -1,4 +1,4 @@
use std::{sync::{mpsc::{channel, Receiver}, Arc, RwLock}, time::UNIX_EPOCH}; use std::sync::{mpsc::{channel, Receiver}, Arc, RwLock};
use std::cell::RefCell; use std::cell::RefCell;
use std::time::{Duration, SystemTime}; use std::time::{Duration, SystemTime};
use std::thread; use std::thread;
@ -32,7 +32,7 @@ ctx::Context, on_send_message, parse_message, print_message, recv_tick, sanitize
struct UiModel { struct UiModel {
chat_box: GtkBox, chat_box: GtkBox,
chat_scrolled: ScrolledWindow, chat_scrolled: ScrolledWindow,
app: Application, // app: Application,
window: ApplicationWindow, window: ApplicationWindow,
#[cfg(feature = "libnotify")] #[cfg(feature = "libnotify")]
notifications: Arc<RwLock<Vec<libnotify::Notification>>> notifications: Arc<RwLock<Vec<libnotify::Notification>>>
@ -57,13 +57,6 @@ fn load_pixbuf(data: &[u8]) -> Pixbuf {
loader.pixbuf().unwrap() loader.pixbuf().unwrap()
} }
fn load_gdk_pixbuf(data: &[u8]) -> gdk_pixbuf::Pixbuf {
let loader = gdk_pixbuf::PixbufLoader::new();
loader.loader_write(data).unwrap();
loader.close().unwrap();
loader.get_pixbuf().unwrap()
}
macro_rules! gui_entry_setting { macro_rules! gui_entry_setting {
($e:expr, $i:ident, $ctx:ident, $vbox:ident) => { ($e:expr, $i:ident, $ctx:ident, $vbox:ident) => {
{ {
@ -596,14 +589,14 @@ fn build_ui(ctx: Arc<Context>, app: &Application) -> UiModel {
UiModel { UiModel {
chat_scrolled, chat_scrolled,
chat_box, chat_box,
app: app.clone(), // app: app.clone(),
window: window.clone(), window: window.clone(),
#[cfg(feature = "libnotify")] #[cfg(feature = "libnotify")]
notifications: Arc::new(RwLock::new(Vec::<libnotify::Notification>::new())) notifications: Arc::new(RwLock::new(Vec::<libnotify::Notification>::new()))
} }
} }
fn setup(app: &Application, ctx: Arc<Context>, ui: UiModel) { fn setup(_: &Application, ctx: Arc<Context>, ui: UiModel) {
let (sender, receiver) = channel(); let (sender, receiver) = channel();
*ctx.sender.write().unwrap() = Some(Arc::new(sender)); *ctx.sender.write().unwrap() = Some(Arc::new(sender));
@ -686,7 +679,10 @@ fn send_notification(_: Arc<Context>, ui: &UiModel, title: &str, message: &str)
let notification = Notification::new(title, message, None); let notification = Notification::new(title, message, None);
notification.set_app_name("bRAC"); notification.set_app_name("bRAC");
notification.set_image_from_pixbuf(&load_gdk_pixbuf(include_bytes!("images/icon.png"))); let pixbuf_loader = gdk_pixbuf::PixbufLoader::new();
pixbuf_loader.loader_write(include_bytes!("images/icon.png")).unwrap();
pixbuf_loader.close().unwrap();
notification.set_image_from_pixbuf(&pixbuf_loader.get_pixbuf().unwrap());
notification.show().expect("libnotify send error"); notification.show().expect("libnotify send error");
ui.notifications.write().unwrap().push(notification); ui.notifications.write().unwrap().push(notification);