Skip to content

Commit 65f58c7

Browse files
committed
Fix merge conflict
1 parent bcac2cc commit 65f58c7

1 file changed

Lines changed: 10 additions & 37 deletions

File tree

src/app/tile/update.rs

Lines changed: 10 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -230,42 +230,6 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
230230

231231
Message::OpenFocused => Task::done(Message::OpenResult(tile.focus_id)),
232232
Message::OpenResult(id) => open_result(tile, id as usize),
233-
Message::OpenFocused => {
234-
info!("Open Focussed called");
235-
let results = if tile.page == Page::ClipboardHistory {
236-
tile.clipboard_content
237-
.iter()
238-
.map(|x| x.to_app().to_owned())
239-
.collect()
240-
} else {
241-
tile.results.clone()
242-
};
243-
match results.get(tile.focus_id as usize) {
244-
Some(App {
245-
search_name: name,
246-
open_command: AppCommand::Function(func),
247-
..
248-
}) => {
249-
info!("Updating ranking for: {name}");
250-
tile.options.update_ranking(name);
251-
Task::done(Message::RunFunction(func.to_owned()))
252-
}
253-
Some(App {
254-
search_name: name,
255-
open_command: AppCommand::Message(msg),
256-
..
257-
}) => {
258-
info!("Updating ranking for: {name}");
259-
tile.options.update_ranking(name);
260-
Task::done(msg.to_owned())
261-
}
262-
Some(App {
263-
open_command: AppCommand::Display,
264-
..
265-
}) => Task::done(Message::ReturnFocus),
266-
None => Task::none(),
267-
}
268-
}
269233

270234
Message::ReloadConfig => {
271235
info!("Reloading config");
@@ -758,7 +722,16 @@ fn resize_for_results_count(id: Id, count: usize) -> Task<Message> {
758722
}
759723

760724
fn open_result(tile: &mut Tile, id: usize) -> Task<Message> {
761-
let Some(app) = tile.results.get(id).cloned() else {
725+
let results = if tile.page == Page::ClipboardHistory {
726+
tile.clipboard_content
727+
.iter()
728+
.map(|x| x.to_app().to_owned())
729+
.collect()
730+
} else {
731+
tile.results.clone()
732+
};
733+
734+
let Some(app) = results.get(id).cloned() else {
762735
return Task::none();
763736
};
764737

0 commit comments

Comments
 (0)