Skip to content

Commit 27f2baf

Browse files
committed
Remove Message::nothing
1 parent c2a8bb9 commit 27f2baf

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

src/app.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ pub enum Message {
3737
ClearSearchQuery,
3838
ReloadConfig,
3939
ClipboardHistory(ClipBoardContentType),
40-
_Nothing,
4140
}
4241

4342
/// The window settings for rustcast

src/app/tile/elm.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,13 @@ pub fn view(tile: &Tile, wid: window::Id) -> Element<'_, Message> {
7373
let title_input = text_input(tile.config.placeholder.as_str(), &tile.query)
7474
.on_input(move |a| Message::SearchQueryChanged(a, wid))
7575
.on_paste(move |a| Message::SearchQueryChanged(a, wid))
76-
.on_submit({
77-
if tile.results.is_empty() {
78-
Message::_Nothing
76+
.on_submit_maybe({
77+
if !tile.results.is_empty() {
78+
Some(Message::RunFunction(
79+
tile.results.first().unwrap().to_owned().open_command,
80+
))
7981
} else {
80-
Message::RunFunction(tile.results.first().unwrap().to_owned().open_command)
82+
None
8183
}
8284
})
8385
.id("query")

src/app/tile/update.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,16 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
146146
operation::focus("query"),
147147
)
148148
} else {
149+
let clear_search_query = if tile.config.buffer_rules.clear_on_hide {
150+
Task::done(Message::ClearSearchQuery)
151+
} else {
152+
Task::none()
153+
};
154+
149155
let to_close = window::latest().map(|x| x.unwrap());
150156
Task::batch([
151157
to_close.map(Message::HideWindow),
152-
Task::done(if tile.config.buffer_rules.clone().clear_on_hide {
153-
Message::ClearSearchQuery
154-
} else {
155-
Message::_Nothing
156-
}),
158+
clear_search_query,
157159
Task::done(Message::ReturnFocus),
158160
])
159161
}
@@ -212,7 +214,5 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
212214
tile.clipboard_content.insert(0, clip_content);
213215
Task::none()
214216
}
215-
216-
Message::_Nothing => Task::none(),
217217
}
218218
}

0 commit comments

Comments
 (0)