diff options
| author | bfredl <bjorn.linse@gmail.com> | 2024-09-10 11:11:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-10 11:11:07 +0200 |
| commit | 4c5bce9cb417cf1c6a93cdd5ca6d3d52d2bf95d6 (patch) | |
| tree | 0d5a5a387dde3374be579188fd0c3b880cf7b48f /src | |
| parent | 5d7853f22903a4f42d52f565f6a662c3ef178a8c (diff) | |
| parent | 8e81212e151a4e20cff33931b95279e14c4e21c2 (diff) | |
| download | rneovim-4c5bce9cb417cf1c6a93cdd5ca6d3d52d2bf95d6.tar.gz rneovim-4c5bce9cb417cf1c6a93cdd5ca6d3d52d2bf95d6.tar.bz2 rneovim-4c5bce9cb417cf1c6a93cdd5ca6d3d52d2bf95d6.zip | |
Merge pull request #30295 from glepnir/nfloat
fix(highlight): floating windows inherit NormalFloat from global-ns
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/highlight.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/highlight.c b/src/nvim/highlight.c index 8729c74ce8..b802eab4b9 100644 --- a/src/nvim/highlight.c +++ b/src/nvim/highlight.c @@ -370,12 +370,15 @@ void update_window_hl(win_T *wp, bool invalid) // determine window specific background set in 'winhighlight' bool float_win = wp->w_floating && !wp->w_config.external; - if (float_win && hl_def[HLF_NFLOAT] != 0) { + if (float_win && hl_def[HLF_NFLOAT] != 0 && ns_id > 0) { wp->w_hl_attr_normal = hl_def[HLF_NFLOAT]; } else if (hl_def[HLF_COUNT] > 0) { wp->w_hl_attr_normal = hl_def[HLF_COUNT]; + } else if (float_win) { + wp->w_hl_attr_normal = HL_ATTR(HLF_NFLOAT) > 0 + ? HL_ATTR(HLF_NFLOAT) : highlight_attr[HLF_NFLOAT]; } else { - wp->w_hl_attr_normal = float_win ? HL_ATTR(HLF_NFLOAT) : 0; + wp->w_hl_attr_normal = 0; } if (wp->w_floating) { |