toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h-gtk: Use clone! macro to replace some boilerplate.

Browse Source
This commit is contained in:
Jordan Petridis 2018-05-13 21:51:32 +03:00
parent 97eef9149c
commit 54fafa07a2
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hammond-gtk/src/app.rs
View File

@ -63,17 +63,13 @@ impl App {
// Create the main window // Create the main window
let window = gtk::Window::new(gtk::WindowType::Toplevel); let window = gtk::Window::new(gtk::WindowType::Toplevel);
window.set_title("Hammond"); window.set_title("Hammond");
let app_clone = application.clone(); window.connect_delete_event(clone!(application, settings, window => move |_, _| {
let window_clone = window.clone(); WindowGeometry::from_window(&window).write(&settings);
let settings_clone = settings.clone(); application.quit();
window.connect_delete_event(move |_, _| {
WindowGeometry::from_window(&window_clone).write(&settings_clone);
app_clone.quit();
Inhibit(false) Inhibit(false)
}); }));
let (sender, receiver) = channel(); let (sender, receiver) = channel();
@ -152,16 +148,16 @@ impl App {
WindowGeometry::from_settings(&self.settings).apply(&self.window); WindowGeometry::from_settings(&self.settings).apply(&self.window);
let window = self.window.clone(); let window = self.window.clone();
self.app_instance.connect_startup(move |app| { self.app_instance.connect_startup(move |app| {
build_ui(&window, app); build_ui(&window, app);
}); });
self.setup_timed_callbacks(); self.setup_timed_callbacks();
let content = self.content.clone(); let content = self.content;
let headerbar = self.header.clone(); let headerbar = self.header;
let sender = self.sender.clone(); let sender = self.sender;
let overlay = self.overlay.clone(); let overlay = self.overlay;
let receiver = self.receiver; let receiver = self.receiver;
gtk::timeout_add(50, move || { gtk::timeout_add(50, move || {
match receiver.try_recv() { match receiver.try_recv() {