Skip to content

Commit 23e742c

Browse files
hulthehulthe
committed
Refactor buttons slightly
1 parent 80e3d76 commit 23e742c

File tree

2 files changed

+51
-49
lines changed

2 files changed

+51
-49
lines changed

‎installer-downloader/src/cacao_impl/delegate.rs

+20-25
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,21 @@ impl AppDelegate for AppWindow {
1515
where
1616
F: Fn() + Send + 'static,
1717
{
18-
let cb = Self::sync_callback(callback);
19-
self.download_button.button.set_action(move || {
20-
let cb = Action::DownloadClick(cb.clone());
21-
cacao::appkit::App::<super::ui::AppImpl, _>::dispatch_main(cb);
22-
});
18+
self.download_button.set_callback(callback);
2319
}
2420

2521
fn on_cancel<F>(&mut self, callback: F)
2622
where
2723
F: Fn() + Send + 'static,
2824
{
29-
let cb = Self::sync_callback(callback);
30-
self.cancel_button.button.set_action(move || {
31-
let cb = Action::CancelClick(cb.clone());
32-
cacao::appkit::App::<super::ui::AppImpl, _>::dispatch_main(cb);
33-
});
25+
self.cancel_button.set_callback(callback);
3426
}
3527

3628
fn on_beta_link<F>(&mut self, callback: F)
3729
where
3830
F: Fn() + Send + 'static,
3931
{
32+
self.beta_link.set_callback(callback);
4033
}
4134

4235
fn set_status_text(&mut self, text: &str) {
@@ -76,35 +69,35 @@ impl AppDelegate for AppWindow {
7669
}
7770

7871
fn show_download_button(&mut self) {
79-
self.download_button.button.set_hidden(false);
72+
self.download_button.set_hidden(false);
8073
}
8174

8275
fn hide_download_button(&mut self) {
83-
self.download_button.button.set_hidden(true);
76+
self.download_button.set_hidden(true);
8477
}
8578

8679
fn enable_download_button(&mut self) {
87-
self.download_button.button.set_enabled(true);
80+
self.download_button.set_enabled(true);
8881
}
8982

9083
fn disable_download_button(&mut self) {
91-
self.download_button.button.set_enabled(false);
84+
self.download_button.set_enabled(false);
9285
}
9386

9487
fn show_cancel_button(&mut self) {
95-
self.cancel_button.button.set_hidden(false);
88+
self.cancel_button.set_hidden(false);
9689
}
9790

9891
fn hide_cancel_button(&mut self) {
99-
self.cancel_button.button.set_hidden(true);
92+
self.cancel_button.set_hidden(true);
10093
}
10194

10295
fn enable_cancel_button(&mut self) {
103-
self.cancel_button.button.set_enabled(true);
96+
self.cancel_button.set_enabled(true);
10497
}
10598

10699
fn disable_cancel_button(&mut self) {
107-
self.cancel_button.button.set_enabled(false);
100+
self.cancel_button.set_enabled(false);
108101
}
109102

110103
fn show_beta_text(&mut self) {
@@ -129,7 +122,7 @@ impl AppDelegate for AppWindow {
129122
where
130123
F: Fn() + Send + 'static,
131124
{
132-
println!("todo. on stable link");
125+
self.stable_link.set_callback(callback);
133126
}
134127

135128
fn show_stable_text(&mut self) {
@@ -141,17 +134,19 @@ impl AppDelegate for AppWindow {
141134
}
142135

143136
fn show_error_message(&mut self, message: installer_downloader::delegate::ErrorMessage) {
144-
let on_cancel = self.error_cancel_callback.clone().map(|cb| {
137+
let on_cancel = self.error_cancel_callback.clone().map(|callback| {
145138
move || {
146-
let cb = Action::ErrorCancel(cb.clone());
147-
cacao::appkit::App::<super::ui::AppImpl, _>::dispatch_main(cb);
139+
let callback = callback.clone();
140+
let callback = Action::ButtonClick { callback };
141+
cacao::appkit::App::<super::ui::AppImpl, _>::dispatch_main(callback);
148142
}
149143
});
150144

151-
let on_retry = self.error_retry_callback.clone().map(|cb| {
145+
let on_retry = self.error_retry_callback.clone().map(|callback| {
152146
move || {
153-
let cb = Action::ErrorRetry(cb.clone());
154-
cacao::appkit::App::<super::ui::AppImpl, _>::dispatch_main(cb);
147+
let callback = callback.clone();
148+
let callback = Action::ButtonClick { callback };
149+
cacao::appkit::App::<super::ui::AppImpl, _>::dispatch_main(callback);
155150
}
156151
});
157152

‎installer-downloader/src/cacao_impl/ui.rs

+31-24
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use std::cell::RefCell;
2-
use std::ops::Deref;
2+
use std::ops::{Deref, DerefMut};
33
use std::sync::{Arc, LazyLock, Mutex, RwLock};
44

55
use cacao::appkit::window::{Window, WindowConfig, WindowDelegate};
@@ -79,16 +79,13 @@ impl AppDelegate for AppImpl {
7979

8080
/// Dispatcher actions
8181
pub enum Action {
82-
/// User clicked the download button
83-
DownloadClick(Arc<Mutex<Box<dyn Fn() + Send>>>),
84-
/// User clicked the cancel button
85-
CancelClick(Arc<Mutex<Box<dyn Fn() + Send>>>),
82+
/// User clicked a button.
83+
ButtonClick {
84+
/// The callback to be invoked in the main thread.
85+
callback: Arc<Mutex<Box<dyn Fn() + Send>>>,
86+
},
8687
/// Run callback on main thread
8788
QueueMain(Mutex<Option<MainThreadCallback>>),
88-
/// User clicked the retry button in the error view
89-
ErrorRetry(Arc<Mutex<Box<dyn Fn() + Send>>>),
90-
/// User clicked the cancel button in the error view
91-
ErrorCancel(Arc<Mutex<Box<dyn Fn() + Send>>>),
9289
/// Quit the application.
9390
Quit,
9491
}
@@ -102,28 +99,16 @@ impl Dispatcher for AppImpl {
10299
fn on_ui_message(&self, message: Self::Message) {
103100
let delegate = self.window.delegate.as_ref().unwrap();
104101
match message {
105-
Action::DownloadClick(cb) => {
106-
let cb = cb.lock().unwrap();
107-
cb();
108-
}
109-
Action::CancelClick(cb) => {
110-
let cb = cb.lock().unwrap();
111-
cb();
102+
Action::ButtonClick { callback } => {
103+
let callback = callback.lock().unwrap();
104+
callback();
112105
}
113106
Action::QueueMain(cb) => {
114107
// NOTE: We assume that this won't panic because they will never run simultaneously
115108
let mut borrowed = delegate.inner.borrow_mut();
116109
let cb = cb.lock().unwrap().take().unwrap();
117110
cb(&mut borrowed);
118111
}
119-
Action::ErrorRetry(cb) => {
120-
let cb = cb.lock().unwrap();
121-
cb();
122-
}
123-
Action::ErrorCancel(cb) => {
124-
let cb = cb.lock().unwrap();
125-
cb();
126-
}
127112
Action::Quit => {
128113
self.window.close();
129114
}
@@ -204,6 +189,28 @@ macro_rules! button_wrapper {
204189
&self.button
205190
}
206191
}
192+
193+
impl DerefMut for $name {
194+
fn deref_mut(&mut self) -> &mut Self::Target {
195+
&mut self.button
196+
}
197+
}
198+
199+
impl $name {
200+
/// Register a callback to be execued on the main thread when this button is pressed.
201+
pub fn set_callback(&mut self, callback: impl Fn() + Send + 'static) {
202+
// Wrap it in an Arc<Mutex> to make it Sync.
203+
// We need this because Dispatcher demands sync, but the AppDelegate trait does not
204+
// impose that requirement on the callback.
205+
let callback = Box::new(callback) as Box<dyn Fn() + Send>;
206+
let callback = Arc::new(Mutex::new(callback));
207+
self.button.set_action(move || {
208+
let callback = callback.clone();
209+
let callback = Action::ButtonClick { callback };
210+
cacao::appkit::App::<super::ui::AppImpl, _>::dispatch_main(callback);
211+
});
212+
}
213+
}
207214
};
208215
}
209216

0 commit comments

Comments
 (0)