Skip to content

Commit 56959e6

Browse files
author
Stephan Dilly
committed
do not highlight selection in diff when not focused (closes #270)
1 parent d179b6b commit 56959e6

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
### Added
1111
- push to origin support ([#265](https://github.com/extrawurst/gitui/issues/265))
1212

13+
### Changed
14+
- do not highlight selection in diff view when not focused ([#270](https://github.com/extrawurst/gitui/issues/270))
15+
1316
## [0.10.1] - 2020-09-01
1417

1518
### Fixed

src/components/diff.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,10 @@ impl DiffComponent {
349349
let mut lines_added = 0_usize;
350350

351351
for (i, hunk) in diff.hunks.iter().enumerate() {
352-
let hunk_selected =
353-
self.selected_hunk.map_or(false, |s| s == i);
352+
let hunk_selected = self.focused()
353+
&& self
354+
.selected_hunk
355+
.map_or(false, |s| s == i);
354356

355357
if lines_added >= height as usize {
356358
break;
@@ -372,8 +374,10 @@ impl DiffComponent {
372374
&mut res,
373375
width,
374376
line,
375-
self.selection
376-
.contains(line_cursor),
377+
self.focused()
378+
&& self
379+
.selection
380+
.contains(line_cursor),
377381
hunk_selected,
378382
i == hunk_len as usize - 1,
379383
&self.theme,

0 commit comments

Comments
 (0)