Skip to content

Pressing d twice requires q twice to exit #826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rigellute merged 5 commits into from
Aug 23, 2021
Merged

Pressing d twice requires q twice to exit #826

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35fa44e
dedup selected device routes from nav stack
cobbinma Jun 1, 2021
3ebee74
dedup any matching routes from nav stack
cobbinma Jun 1, 2021
ee4d373
catch duplicate route id on push
cobbinma Jul 6, 2021
9e5e4b1
remove return
cobbinma Jul 6, 2021
e8116ff
remove id from variable name
cobbinma Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
dedup any matching routes from nav stack
  • Loading branch information
@cobbinma
cobbinma committed Jun 1, 2021
commit 3ebee74c3e23c2ea60841a7f2f54ec3e4c58238a
3 changes: 1 addition & 2 deletions src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ use std::{
use tui::layout::Rect;

use arboard::Clipboard;
use crate::app::RouteId::SelectedDevice;

pub const LIBRARY_OPTIONS: [&str; 6] = [
"Made For You",
Expand Down Expand Up @@ -635,7 +634,7 @@ impl App {
}

pub fn pop_navigation_stack(&mut self) -> Option<Route> {
self.navigation_stack.dedup_by_key(|x| x.id == SelectedDevice);
self.navigation_stack.dedup_by(|a, b| a.id == b.id);
Copy link
Copy Markdown

@RagnarGrootKoerkamp RagnarGrootKoerkamp Jul 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be just a bit nicer to do this in push_navigation_stack, assuming that that is the only place where the stack is stack is grown. In that case, it could possibly be just an if statement checking whether the current id is the same as the id at the top of the stack.

Copy link
Copy Markdown
Contributor Author

@cobbinma cobbinma Jul 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for looking at this 👍 moved to push_navigation_stack and changed to if statement.


if self.navigation_stack.len() == 1 {
None
Expand Down