Skip to content

fix: When the terminal is insufficient to display all the commands, the cmdbar_bg configuration color does not fully take effect #2348

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: When the terminal is insufficient to display all the commands, the cmdbar_bg configuration color does not fully take effect #2348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* use default shell instead of bash on Unix-like OS [[@yerke](https://github.com/yerke)] ([#2343](https://github.com/extrawurst/gitui/pull/2343))

### Fixes
* When the terminal is insufficient to display all the commands, the cmdbar_bg configuration color does not fully take effect. ([#2347](https://github.com/extrawurst/gitui/issues/2347))
* respect env vars like `GIT_CONFIG_GLOBAL` ([#2298](https://github.com/extrawurst/gitui/issues/2298))
* Set `CREATE_NO_WINDOW` flag when executing Git hooks on Windows ([#2371](https://github.com/extrawurst/gitui/pull/2371))

Expand Down
6 changes: 1 addition & 5 deletions src/cmdbar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ enum DrawListEntry {
struct Command {
txt: String,
enabled: bool,
line: usize,
}

/// helper to be used while drawing
Expand Down Expand Up @@ -106,7 +105,6 @@ impl CommandBar {
self.draw_list.push(DrawListEntry::Command(Command {
txt: c.text.name.to_string(),
enabled: c.enabled,
line: lines.saturating_sub(1) as usize,
}));
}

Expand Down Expand Up @@ -157,9 +155,7 @@ impl CommandBar {
DrawListEntry::Command(c) => {
Span::styled(
Cow::from(c.txt.as_str()),
self.theme.commandbar(
c.enabled, c.line,
),
self.theme.commandbar(c.enabled),
)
}
DrawListEntry::LineBreak => {
Expand Down
10 changes: 2 additions & 8 deletions src/ui/style.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ pub struct Theme {
selection_bg: Color,
selection_fg: Color,
cmdbar_bg: Color,
cmdbar_extra_lines_bg: Color,
disabled_fg: Color,
diff_line_add: Color,
diff_line_delete: Color,
Expand Down Expand Up @@ -204,17 +203,13 @@ impl Theme {
self.line_break.clone()
}

pub fn commandbar(&self, enabled: bool, line: usize) -> Style {
pub fn commandbar(&self, enabled: bool) -> Style {
if enabled {
Style::default().fg(self.command_fg)
} else {
Style::default().fg(self.disabled_fg)
}
.bg(if line == 0 {
self.cmdbar_bg
} else {
self.cmdbar_extra_lines_bg
})
.bg(self.cmdbar_bg)
}

pub fn commit_hash(&self, selected: bool) -> Style {
Expand Down Expand Up @@ -335,7 +330,6 @@ impl Default for Theme {
selection_bg: Color::Blue,
selection_fg: Color::White,
cmdbar_bg: Color::Blue,
cmdbar_extra_lines_bg: Color::Blue,
disabled_fg: Color::DarkGray,
diff_line_add: Color::Green,
diff_line_delete: Color::Red,
Expand Down