Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ pub enum Message {
ClearSearchQuery,
ReloadConfig,
ClipboardHistory(ClipBoardContentType),
_Nothing,
}

/// The window settings for rustcast
Expand Down
10 changes: 6 additions & 4 deletions src/app/tile/elm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,13 @@ pub fn view(tile: &Tile, wid: window::Id) -> Element<'_, Message> {
let title_input = text_input(tile.config.placeholder.as_str(), &tile.query)
.on_input(move |a| Message::SearchQueryChanged(a, wid))
.on_paste(move |a| Message::SearchQueryChanged(a, wid))
.on_submit({
if tile.results.is_empty() {
Message::_Nothing
.on_submit_maybe({
if !tile.results.is_empty() {
Some(Message::RunFunction(
tile.results.first().unwrap().to_owned().open_command,
))
} else {
Message::RunFunction(tile.results.first().unwrap().to_owned().open_command)
None
}
})
.id("query")
Expand Down
14 changes: 7 additions & 7 deletions src/app/tile/update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,16 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
operation::focus("query"),
)
} else {
let clear_search_query = if tile.config.buffer_rules.clear_on_hide {
Task::done(Message::ClearSearchQuery)
} else {
Task::none()
};

let to_close = window::latest().map(|x| x.unwrap());
Task::batch([
to_close.map(Message::HideWindow),
Task::done(if tile.config.buffer_rules.clone().clear_on_hide {
Message::ClearSearchQuery
} else {
Message::_Nothing
}),
clear_search_query,
Task::done(Message::ReturnFocus),
])
}
Expand Down Expand Up @@ -212,7 +214,5 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
tile.clipboard_content.insert(0, clip_content);
Task::none()
}

Message::_Nothing => Task::none(),
}
}