qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-26 23:36:08 +03:00
Code Issues Projects Releases Wiki Activity

Replace cursor attributes with defaults from current cell to enable correct handling of guibg=NONE and guig=NONE

Browse Source
This commit is contained in:
Johann Rudloff 2020-04-19 16:27:27 +02:00
parent 4be4923fee
commit bcb894acc9
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NvimView/NvimView/CellAttributesCollection.swift
View File

@ -21,13 +21,17 @@ final class CellAttributesCollection {
init() { self.attributes[CellAttributesCollection.defaultAttributesId] = self.defaultAttributes } init() { self.attributes[CellAttributesCollection.defaultAttributesId] = self.defaultAttributes }
func attributes(of id: Int) -> CellAttributes? { func attributes(of id: Int) -> CellAttributes? {
return self.attributes(of: id, withDefaults: self.defaultAttributes)
}
func attributes(of id: Int, withDefaults defaults: CellAttributes) -> CellAttributes? {
if id == Int.max { return self.defaultAttributes.reversed } if id == Int.max { return self.defaultAttributes.reversed }
let absId = abs(id) let absId = abs(id)
guard let attrs = self.attributes[absId] else { return nil } guard let attrs = self.attributes[absId] else { return nil }
if id < 0 { return attrs.replacingDefaults(with: self.defaultAttributes).reversed } if id < 0 { return attrs.replacingDefaults(with: self.defaultAttributes).reversed }
return attrs.replacingDefaults(with: self.defaultAttributes) return attrs.replacingDefaults(with: defaults)
} }
func set(attributes: CellAttributes, for id: Int) { func set(attributes: CellAttributes, for id: Int) {

3
NvimView/NvimView/NvimView+Draw.swift
View File

@ -100,7 +100,8 @@ extension NvimView {
guard let cursorAttrId = modeInfo.attrId, guard let cursorAttrId = modeInfo.attrId,
let cursorShapeAttrs = self.cellAttributesCollection.attributes( let cursorShapeAttrs = self.cellAttributesCollection.attributes(
of: cursorAttrId of: cursorAttrId,
withDefaults: cellAtCursorAttrs
) else { ) else {
self.log.error("Could not get the attributes" + self.log.error("Could not get the attributes" +
" for cursor in mode: \(mode) \(modeInfo)") " for cursor in mode: \(mode) \(modeInfo)")