qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-25 06:43:24 +03:00
Code Issues Projects Releases Wiki Activity

Fix merge conflict resolution

Browse Source
This commit is contained in:
Tae Won Ha 2018-05-13 18:54:08 +02:00
parent beae0d6a58
commit 2881f41432
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NvimView/NvimServer/server_ui.m
View File

@ -526,6 +526,7 @@ static void server_ui_default_colors_set(
}
send_msg_packing(NvimServerMsgIdDefaultColorsChanged, ^(msgpack_packer *packer) {
msgpack_pack_array(packer, 3);
msgpack_pack_int64(packer, _default_foreground);
msgpack_pack_int64(packer, _default_background);
msgpack_pack_int64(packer, _default_special);

2
NvimView/NvimView/NvimView+UiBridge.swift
View File

@ -293,7 +293,7 @@ extension NvimView {
self.grid.background = values[1]
self.grid.special = values[2]
self.layer?.backgroundColor = ColorUtils.colorIgnoringAlpha(self.grid.background).cgColor
self.layer?.backgroundColor = ColorUtils.cgColorIgnoringAlpha(self.grid.background)
}
}