Merge remote-tracking branches 'github/pr/864' and 'github/pr/866'
This commit is contained in:
@@ -2,6 +2,7 @@ use notedeck::{AppAction, AppContext};
|
||||
use notedeck_columns::Damus;
|
||||
use notedeck_dave::Dave;
|
||||
|
||||
#[allow(clippy::large_enum_variant)]
|
||||
pub enum NotedeckApp {
|
||||
Dave(Dave),
|
||||
Columns(Damus),
|
||||
|
||||
@@ -500,13 +500,14 @@ fn chrome_handle_app_action(
|
||||
|
||||
let txn = Transaction::new(ctx.ndb).unwrap();
|
||||
|
||||
notedeck_columns::actionbar::execute_and_process_note_action(
|
||||
let cols = columns
|
||||
.decks_cache
|
||||
.active_columns_mut(ctx.accounts)
|
||||
.unwrap();
|
||||
let m_action = notedeck_columns::actionbar::execute_and_process_note_action(
|
||||
note_action,
|
||||
ctx.ndb,
|
||||
columns
|
||||
.decks_cache
|
||||
.active_columns_mut(ctx.accounts)
|
||||
.unwrap(),
|
||||
cols,
|
||||
0,
|
||||
&mut columns.timeline_cache,
|
||||
ctx.note_cache,
|
||||
@@ -519,6 +520,12 @@ fn chrome_handle_app_action(
|
||||
ctx.img_cache,
|
||||
ui,
|
||||
);
|
||||
|
||||
if let Some(action) = m_action {
|
||||
let col = cols.column_mut(0);
|
||||
|
||||
action.process(&mut col.router, &mut col.sheet_router);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user