Skip to content
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

Dismiss commit msg key #2563

Merged
merged 4 commits into from
Mar 16, 2025
Merged

Dismiss commit msg key #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b094d2f
Change the default key for closing the commit error dialog to Escape key
wessamfathi Mar 14, 2025
2b9c8e9
Changed the default key for closing commit error popup to Escape key
wessamfathi Mar 14, 2025
18c63ed
Fix the command legend to show Escape for closing the commit error popup
wessamfathi Mar 15, 2025
c81c2ca
Merge branch 'master' into dismiss_commit_msg_key
wessamfathi Mar 15, 2025
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: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
* improve syntax highlighting file detection [[@acuteenvy](https://github.com/acuteenvy)] ([#2524](https://github.com/extrawurst/gitui/pull/2524))
* After commit: jump back to unstaged area [[@tommady](https://github.com/tommady)] ([#2476](https://github.com/extrawurst/gitui/issues/2476))
* The default key to close the commit error message popup is now the Escape key [[@wessamfathi](https://github.com/wessamfathi)] ([#2552](https://github.com/extrawurst/gitui/issues/2552))
* use OSC52 copying in case other methods fail [[@naseschwarz](https://github.com/naseschwarz)] ([#2366](https://github.com/gitui-org/gitui/issues/2366))

## [0.27.0] - 2024-01-14
Expand Down
4 changes: 2 additions & 2 deletions src/popups/msg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ impl Component for MsgPopup {
_force_all: bool,
) -> CommandBlocking {
out.push(CommandInfo::new(
strings::commands::close_msg(&self.key_config),
strings::commands::close_popup(&self.key_config),
true,
self.visible,
));
Expand All @@ -135,7 +135,7 @@ impl Component for MsgPopup {
fn event(&mut self, ev: &Event) -> Result<EventState> {
if self.visible {
if let Event::Key(e) = ev {
if key_match(e, self.key_config.keys.enter) {
if key_match(e, self.key_config.keys.exit_popup) {
self.hide();
} else if key_match(
e,
Expand Down