Make VimR tab colors match 1:1 with colorscheme. #1072
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Additionally: Pick up system accent color properly when no colors set.
NvimView+Resize.swift:
- Now transmitting Tabline, TablineFill colors to the VimR
UI, as well as TablineSel
- Replace the built-in get() + nvim_get_hl() method because they don't
have handle 'link' highlights properly (they return -1 for color code)
- defined a new GetHiColor vimscript method that behaves like get()
but also reads `link` type highlight groups by following the
link.
NvimView+Types.swift:
- visualForegroundColor is picked up from user accent color in System
Settings using NSColor.Name("controlAccentColor")
- Updated to include all additional colors
NvimView+UiBridge.swift:
- Updated MessagePackUtils value code to accomodate new color code fields
Tabs/Tab.swift:
- Get Selected tab color from TablineSel
Tabs/TabBar.swift:
- Set tab bar color to TablineFill
Tabs/Theme.swift:
- Add new fields for TablineFill and TablineSel color corresponding to
tab bar background and selected tab colors
- Minor rearranging of field order
VimR/Theme.swift:
- Add new fields for the tab bar, tab, and selected tab colors
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Background:
See issue #1069 - Themes with Hi groups using "links" to other Hi groups do not propagate colors to SwiftUI properly.
Description:
This pull requests further expands upon my previous PR, more closely setting the VimR tab colors to match the colors specified by the vim colors scheme.
Not only does it pull in the
Tablinecolor definition, but it also pulls inTablineFillfor the tabbar background, andTablineSelto highlight the current selected tab.I've also tweaked the default colors selected when VimR is not set to use vim's color scheme, and have tested in both light and dark mode.
Please look over my PR and let me know if there are any mistakes that could lead to stability problems. So far
Additional Change:
I noticed a TODO: regarding the default color scheme when VimR is set to use the native Coacoa colors, and added a call to NSColor.Name() to select the user's chosen accent color from system settings.
One limitation of this change is that the VimR tab UI does not pick up on changes between Dark Mode and Light Mode. I considered polling the plist settings, but I would like to implement that with an event listener to prevent slow polling threads in the background. I am still doing research on how to do this.
For now, use either the Vim color scheme, or re-open the VimR window when changing the system them.