Skip to content

Commit

Permalink
fix(ui): 🐛 Fix top bar opening & closing projects
Browse files Browse the repository at this point in the history
  • Loading branch information
@melody-rs
melody-rs committed Nov 21, 2023
1 parent 799ef16 commit 606a199
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 31 deletions.
5 changes: 2 additions & 3 deletions crates/luminol-ui/src/tabs/started.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ impl luminol_core::Tab for Tab {

ui.heading("Recent");

// FIXME
// FIXME this logic is shared with the top bar
// We should probably join the two
for path in update_state.global_config.recent_projects.clone() {
#[cfg(target_arch = "wasm32")]
let (path, idb_key) = path;
Expand Down Expand Up @@ -151,7 +152,6 @@ impl luminol_core::Tab for Tab {
update_state.toasts.warning(format!(
"Failed to find suitable path for the RTP {missing_rtp}"
));
// FIXME we should probably load rtps from the RTP/<rtp> paths on non-wasm targets
#[cfg(not(target_arch = "wasm32"))]
update_state
.toasts
Expand All @@ -164,7 +164,6 @@ impl luminol_core::Tab for Tab {

if let Err(why) = update_state.data.load(
update_state.filesystem,
// TODO code jank
update_state.project_config.as_mut().unwrap(),
) {
update_state
Expand Down
20 changes: 14 additions & 6 deletions src/app/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,15 +217,13 @@ impl luminol_app::CustomApp for App {
}
});

let mut edit_windows = luminol_core::EditWindows::default();
let mut edit_tabs = luminol_core::EditTabs::default();
let mut update_state = luminol_core::UpdateState {
audio: &mut self.audio,
graphics: self.graphics.clone(),
filesystem: &mut self.filesystem,
data: &mut self.data,
edit_windows: &mut edit_windows,
edit_tabs: &mut edit_tabs,
edit_windows: &mut luminol_core::EditWindows::default(),
edit_tabs: &mut luminol_core::EditTabs::default(),
toasts: &mut self.toasts,
project_config: &mut self.project_config,
global_config: &mut self.global_config,
Expand All @@ -239,6 +237,14 @@ impl luminol_app::CustomApp for App {
ui.visuals_mut().button_frame = false;
// Show the bar
self.top_bar.ui(ui, frame, &mut update_state);

// Process edit tabs for any changes made by top bar.
// If we don't do this before displaying windows and tabs, any changes made by the top bar will be delayed a frame.
// This means closing the project, for example, won't close tabs until the frame after.
self.tabs
.process_edit_tabs(std::mem::take(update_state.edit_tabs));
self.windows
.process_edit_windows(std::mem::take(update_state.edit_windows));
});
});

Expand All @@ -254,8 +260,10 @@ impl luminol_app::CustomApp for App {

// If we don't do this tabs added by windows won't be added.
// It also cleans up code nicely.
self.tabs.process_edit_tabs(edit_tabs);
self.windows.process_edit_windows(edit_windows);
self.tabs
.process_edit_tabs(std::mem::take(update_state.edit_tabs));
self.windows
.process_edit_windows(std::mem::take(update_state.edit_windows));

// Show toasts.
self.toasts.show(ctx);
Expand Down
94 changes: 72 additions & 22 deletions src/app/top_bar.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use strum::IntoEnumIterator;
/// The top bar for managing the project.
#[derive(Default)]
pub struct TopBar {
load_project_promise: Option<poll_promise::Promise<PromiseResult>>,
load_filesystem_promise: Option<poll_promise::Promise<PromiseResult>>,

fullscreen: bool,
}
Expand Down Expand Up @@ -70,7 +70,7 @@ impl TopBar {
"No project open".to_string()
});

ui.add_enabled_ui(self.load_project_promise.is_none(), |ui| {
ui.add_enabled_ui(self.load_filesystem_promise.is_none(), |ui| {
if ui.button("New Project").clicked() {
update_state
.edit_windows
Expand All @@ -96,6 +96,8 @@ impl TopBar {
update_state.edit_tabs.clean(|t| !t.requires_filesystem());
update_state.audio.clear_sinks(); // audio loads files borrows from the filesystem. unloading while they are playing is a crash
update_state.filesystem.unload_project();
*update_state.project_config = None;
update_state.data.unload();
}

save_project |= ui.button("Save Project").clicked();
Expand Down Expand Up @@ -280,13 +282,13 @@ impl TopBar {
if open_project {
#[cfg(not(target_arch = "wasm32"))]
{
self.load_project_promise = Some(poll_promise::Promise::spawn_async(
self.load_filesystem_promise = Some(poll_promise::Promise::spawn_async(
luminol_filesystem::host::FileSystem::from_file_picker(),
));
}
#[cfg(target_arch = "wasm32")]
{
self.load_project_promise = Some(poll_promise::Promise::spawn_local(
self.load_filesystem_promise = Some(poll_promise::Promise::spawn_local(
luminol_filesystem::host::FileSystem::from_folder_picker(),
));
}
Expand All @@ -302,30 +304,78 @@ impl TopBar {
}
}

if let Some(p) = self.load_project_promise.take() {
let mut filesystem_open_result = None;
#[cfg(target_arch = "wasm32")]
let mut idb_key = None;

if let Some(p) = self.load_filesystem_promise.take() {
match p.try_take() {
Ok(Ok(host)) => {
if let Err(why) = update_state.data.load(
update_state.filesystem,
// TODO code jank
update_state.project_config.as_mut().unwrap(),
) {
update_state
.toasts
.error(why.context("while loading project data").to_string());
} else {
update_state.toasts.info(format!(
"Successfully opened {:?}",
update_state
.filesystem
.project_path()
.expect("project not open")
));
#[cfg(target_arch = "wasm32")]
{
idb_key = host.idb_key().map(str::to_string);
}

filesystem_open_result = Some(update_state.filesystem.load_project(
host,
update_state.project_config,
update_state.global_config,
));
}
Ok(Err(error)) => update_state.toasts.error(error.to_string()),
Err(p) => self.load_project_promise = Some(p),
Err(p) => self.load_filesystem_promise = Some(p),
}

ui.spinner();
}

match filesystem_open_result {
Some(Ok(load_result)) => {
for missing_rtp in load_result.missing_rtps {
update_state.toasts.warning(format!(
"Failed to find suitable path for the RTP {missing_rtp}"
));
// FIXME we should probably load rtps from the RTP/<rtp> paths on non-wasm targets
#[cfg(not(target_arch = "wasm32"))]
update_state
.toasts
.info(format!("You may want to set an RTP path for {missing_rtp}"));
#[cfg(target_arch = "wasm32")]
update_state
.toasts
.info(format!("Please place the {missing_rtp} RTP in the 'RTP/{missing_rtp}' subdirectory in your project directory"));
}

if let Err(why) = update_state.data.load(
update_state.filesystem,
// TODO code jank
update_state.project_config.as_mut().unwrap(),
) {
update_state
.toasts
.error(format!("Error loading the project data: {why}"));

#[cfg(target_arch = "wasm32")]
idb_key.map(luminol_filesystem::host::FileSystem::idb_drop);
} else {
update_state.toasts.info(format!(
"Successfully opened {:?}",
update_state
.filesystem
.project_path()
.expect("project not open")
));
}
}
Some(Err(why)) => {
update_state
.toasts
.error(format!("Error opening the project: {why}"));

#[cfg(target_arch = "wasm32")]
idb_key.map(luminol_filesystem::host::FileSystem::idb_drop);
}
None => {}
}
}
}

0 comments on commit 606a199

Please sign in to comment.