1
1
mirror of https://github.com/qvacua/vimr.git synced 2024-12-25 06:43:24 +03:00

Merge branch 'develop' into meta-543

This commit is contained in:
Tae Won Ha 2018-04-03 22:39:32 +02:00
commit e3db1675ab
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
14 changed files with 59 additions and 50 deletions

View File

@ -218,7 +218,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 270;
CURRENT_PROJECT_VERSION = 271;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -278,7 +278,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 270;
CURRENT_PROJECT_VERSION = 271;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -308,7 +308,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 270;
DYLIB_CURRENT_VERSION = 271;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = MsgPackRpc/Info.plist;
@ -331,7 +331,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 270;
DYLIB_CURRENT_VERSION = 271;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = MsgPackRpc/Info.plist;

View File

@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-270</string>
<string>0.21.2</string>
<key>CFBundleVersion</key>
<string>270</string>
<string>271</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2017 Tae Won Ha. All rights reserved.</string>
<key>NSPrincipalClass</key>

View File

@ -218,7 +218,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 270;
CURRENT_PROJECT_VERSION = 271;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -278,7 +278,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 270;
CURRENT_PROJECT_VERSION = 271;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -308,7 +308,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 270;
DYLIB_CURRENT_VERSION = 271;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = NvimMsgPack/Info.plist;
@ -331,7 +331,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 270;
DYLIB_CURRENT_VERSION = 271;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = NvimMsgPack/Info.plist;

View File

@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-270</string>
<string>0.21.2</string>
<key>CFBundleVersion</key>
<string>270</string>
<string>271</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2017 Tae Won Ha. All rights reserved.</string>
<key>NSPrincipalClass</key>

View File

@ -458,7 +458,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 270;
CURRENT_PROJECT_VERSION = 271;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -516,7 +516,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 270;
CURRENT_PROJECT_VERSION = 271;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -543,7 +543,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 270;
DYLIB_CURRENT_VERSION = 271;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
FRAMEWORK_VERSION = A;
@ -565,7 +565,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 270;
DYLIB_CURRENT_VERSION = 271;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
FRAMEWORK_VERSION = A;

View File

@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-270</string>
<string>0.21.2</string>
<key>CFBundleVersion</key>
<string>270</string>
<string>271</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2017 Tae Won Ha. All rights reserved.</string>
<key>NSPrincipalClass</key>

View File

@ -127,9 +127,12 @@ extension NvimView {
}
private func drawBackground(rowRun: RowRun, in context: CGContext) {
if rowRun.attrs.background == self.grid.background {
return
}
// TODO: GH-612
// The following seems to break the anti-aliasing...
// Find another way to avoid double rendering of the background
// if rowRun.attrs.background == self.grid.background {
// return
// }
context.saveGState()
defer { context.restoreGState() }

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>

View File

@ -1032,7 +1032,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 270;
CURRENT_PROJECT_VERSION = 271;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -1087,7 +1087,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 270;
CURRENT_PROJECT_VERSION = 271;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;

View File

@ -32,7 +32,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-270</string>
<string>0.21.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@ -49,7 +49,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>270</string>
<string>271</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>

View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-270</string>
<string>0.21.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>270</string>
<string>271</string>
</dict>
</plist>

View File

@ -7,27 +7,23 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>v0.21.1-269</title>
<title>v0.21.2-271</title>
<description><![CDATA[
<ul>
<li>GH-548: Bugfix: When using certain plugings, writing beyond the right border crashes.</li>
<li>GH-620: Bugfix: Wrong underline rendering.</li>
<li>Dependencies updates:<ul>
<li>httpswift/swifter@1.4.0</li>
</ul>
</li>
<li>GH-626: Bugfix: Emoji menu (<code>Cmd-Ctrl-Space</code>) does not work.</li>
<li>GH-162: Bugfix: Anti-aliasing on non-Retina display is broken.</li>
</ul>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/v0.21.1-269
https://github.com/qvacua/vimr/releases/tag/v0.21.2-271
</releaseNotesLink>
<pubDate>2018-03-21T18:25:33.483368</pubDate>
<pubDate>2018-04-03T08:25:05.984139</pubDate>
<minimumSystemVersion>10.10.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.21.1-269/VimR-v0.21.1-269.tar.bz2"
sparkle:version="269"
sparkle:shortVersionString="0.21.1"
sparkle:dsaSignature="MCwCFHrSPNSN+/4uYMd8SGHGztHkSzoPAhRg/u1nCl+R929EboHvVYaKoYYSqA=="
length="11997830"
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.21.2-271/VimR-v0.21.2-271.tar.bz2"
sparkle:version="271"
sparkle:shortVersionString="0.21.2"
sparkle:dsaSignature="MC0CFDc438YW/yPNrlly4f6BSNT3e2exAhUA0LqdN9TxVItiWspS2IFyHkVRIzI="
length="12097684"
type="application/octet-stream"/>
</item>
</channel>

View File

@ -7,22 +7,23 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>SNAPSHOT-270</title>
<title>v0.21.2-271</title>
<description><![CDATA[
<ul>
<li>GH-626: Bugfix: Emoji menu (<code>Cmd-Ctrl-Space</code>) does not work.</li>
<li>GH-162: Bugfix: Anti-aliasing on non-Retina display is broken.</li>
</ul>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/snapshot/270
https://github.com/qvacua/vimr/releases/tag/v0.21.2-271
</releaseNotesLink>
<pubDate>2018-03-25T10:41:49.378845</pubDate>
<pubDate>2018-04-03T08:25:05.984139</pubDate>
<minimumSystemVersion>10.10.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/snapshot/270/VimR-SNAPSHOT-270.tar.bz2"
sparkle:version="270"
sparkle:shortVersionString="SNAPSHOT-270"
sparkle:dsaSignature="MCwCFFhvezrIZGWH7HkIeDaUwxGbI3g5AhQqdvheJTjXKxAL2nnYzppWHyZ7Zg=="
length="11996610"
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.21.2-271/VimR-v0.21.2-271.tar.bz2"
sparkle:version="271"
sparkle:shortVersionString="0.21.2"
sparkle:dsaSignature="MC0CFDc438YW/yPNrlly4f6BSNT3e2exAhUA0LqdN9TxVItiWspS2IFyHkVRIzI="
length="12097684"
type="application/octet-stream"/>
</item>
</channel>

View File

@ -1,6 +1,7 @@
# next
# 0.21.2-271
* GH-626: Bugfix: Emoji menu (`Cmd-Ctrl-Space`) does not work.
* GH-162: Bugfix: Anti-aliasing on non-Retina display is broken.
# 0.21.1-269