From c34a4adb7151abb29060760e6ccf251254a8844e Mon Sep 17 00:00:00 2001 From: Kamil Jarosz Date: Wed, 11 Sep 2024 21:28:00 +0200 Subject: [PATCH] desktop: Rename pick_file to pick_ruffle_file This change emphasizes that we want to pick a file to open by Ruffle contrary to picking files e.g. from ActionScript. --- desktop/src/app.rs | 2 +- desktop/src/gui/picker.rs | 2 +- desktop/src/gui/widgets.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/src/app.rs b/desktop/src/app.rs index dd2da99ad..deec54821 100644 --- a/desktop/src/app.rs +++ b/desktop/src/app.rs @@ -492,7 +492,7 @@ impl App { let picker = self.gui.borrow().file_picker(); tokio::spawn(async move { if let Some(url) = picker - .pick_file(None) + .pick_ruffle_file(None) .await .and_then(|p| Url::from_file_path(p).ok()) { diff --git a/desktop/src/gui/picker.rs b/desktop/src/gui/picker.rs index 08b233919..3f0cf9592 100644 --- a/desktop/src/gui/picker.rs +++ b/desktop/src/gui/picker.rs @@ -32,7 +32,7 @@ impl FilePicker { } } - pub async fn pick_file(&self, dir: Option) -> Option { + pub async fn pick_ruffle_file(&self, dir: Option) -> Option { if self.data.picking.swap(true, Ordering::SeqCst) { // Already picking return None; diff --git a/desktop/src/gui/widgets.rs b/desktop/src/gui/widgets.rs index 5363d7902..0260bfb01 100644 --- a/desktop/src/gui/widgets.rs +++ b/desktop/src/gui/widgets.rs @@ -64,7 +64,7 @@ impl PathOrUrlField { let value = self.value.clone(); let picker = self.picker.clone(); tokio::spawn(async move { - if let Some(path) = picker.pick_file(dir).await { + if let Some(path) = picker.pick_ruffle_file(dir).await { let mut value_lock = Self::lock_value(&value); *value_lock = path.to_string_lossy().to_string(); }