qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-11-24 19:47:41 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into redesign

Browse Source
This commit is contained in:
Tae Won Ha 2017-01-23 19:50:30 +01:00
commit f9509abeae
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
12 changed files with 57 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OutlineViewTest/Info.plist
View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-163</string>
<string>0.13.0</string>
<key>CFBundleVersion</key>
<string>163</string>
<string>164</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

4
SwiftNeoVim/Info.plist
View File

@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-163</string>
<string>0.13.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>163</string>
<string>164</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2016 Tae Won Ha. All rights reserved.</string>
<key>NSPrincipalClass</key>

18
SwiftNeoVim/NeoVimView.swift
View File

@ -154,7 +154,7 @@ public class NeoVimView: NSView, NeoVimUiBridgeProtocol, NSUserInterfaceValidati
fileprivate var isCurrentlyPinching = false
fileprivate var pinchTargetScale = CGFloat(1)
fileprivate var pinchImage = NSImage()
fileprivate var pinchBitmap: NSBitmapImageRep?
fileprivate var currentlyResizing = false
fileprivate var currentEmoji = "😎"
@ -451,10 +451,21 @@ extension NeoVimView {
let context = NSGraphicsContext.current()!.cgContext
if self.isCurrentlyPinching {
let interpolationQuality = context.interpolationQuality
context.interpolationQuality = .none
let boundsSize = self.bounds.size
let targetSize = CGSize(width: boundsSize.width * self.pinchTargetScale,
height: boundsSize.height * self.pinchTargetScale)
self.pinchImage.draw(in: CGRect(origin: self.bounds.origin, size: targetSize))
self.pinchBitmap?.draw(in: CGRect(origin: self.bounds.origin, size: targetSize),
from: CGRect.zero,
operation: .sourceOver,
fraction: 1,
respectFlipped: true,
hints: nil)
context.interpolationQuality = interpolationQuality
return
}
@ -1015,8 +1026,7 @@ extension NeoVimView {
case NSEventPhase.began:
let pinchImageRep = self.bitmapImageRepForCachingDisplay(in: self.bounds)!
self.cacheDisplay(in: self.bounds, to: pinchImageRep)
self.pinchImage = NSImage()
self.pinchImage.addRepresentation(pinchImageRep)
self.pinchBitmap = pinchImageRep
self.isCurrentlyPinching = true
self.needsDisplay = true

4
SwiftNeoVimTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-163</string>
<string>0.13.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>163</string>
<string>164</string>
</dict>
</plist>

4
VimR-Workspace-Demo/Info.plist
View File

@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-163</string>
<string>0.13.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>163</string>
<string>164</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

8
VimR.xcodeproj/project.pbxproj
View File

@ -1483,7 +1483,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 163;
DYLIB_CURRENT_VERSION = 164;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -1507,7 +1507,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 163;
DYLIB_CURRENT_VERSION = 164;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -1699,7 +1699,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 163;
CURRENT_PROJECT_VERSION = 164;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -1749,7 +1749,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 163;
CURRENT_PROJECT_VERSION = 164;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;

5
VimR/Base.lproj/Credits.rtf
View File

@ -82,6 +82,11 @@ By:
\b0 {\field{\*\fldinst{HYPERLINK "https://github.com/indragiek/CocoaMarkdown"}}{\fldrslt https://github.com/indragiek/CocoaMarkdown}}\
\
\b Swifter\
\b0 {\field{\*\fldinst{HYPERLINK "https://github.com/httpswift/swifter"}}{\fldrslt https://github.com/httpswift/swifter}}\
\
\b github-markdown-css\

4
VimR/Info.plist
View File

@ -36,7 +36,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-163</string>
<string>0.13.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@ -53,7 +53,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>163</string>
<string>164</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

7
VimR/MarkdownRenderer.swift
View File

@ -172,9 +172,6 @@ class MarkdownRenderer: NSObject, Flow, PreviewRenderer {
let menuItems: [NSMenuItem]?
init(source: Observable<Any>, scrollSource: Observable<Any>, httpServer: Swifter.HttpServer, initialData: PrefData) {
NSLog("\(#function) \(uuid)")
NSLog("\(#function) \(self.tempDir)")
guard let templateUrl = Bundle.main.url(forResource: "template",
withExtension: "html",
subdirectory: "markdown")
@ -272,6 +269,10 @@ class MarkdownRenderer: NSObject, Flow, PreviewRenderer {
return nil
}
guard FileUtils.fileExists(at: url) else {
return nil
}
return url
default:

4
VimRTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-163</string>
<string>0.13.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>163</string>
<string>164</string>
</dict>
</plist>

18
appcast.xml
View File

@ -7,22 +7,22 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>v0.12.6-162</title>
<title>v0.13.0-164</title>
<description><![CDATA[
<ul>
<li>GH-382: Bugfix: Sometimes the working directory is not set correctly when using the command line tool <code>vimr</code>.</li>
<li>GH-339: Add a simple markdown previewer.</li>
</ul>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/v0.12.6-162
https://github.com/qvacua/vimr/releases/tag/v0.13.0-164
</releaseNotesLink>
<pubDate>2017-01-10T18:14:29.004786</pubDate>
<pubDate>2017-01-22T13:58:21.099701</pubDate>
<minimumSystemVersion>10.10.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.12.6-162/VimR-v0.12.6-162.tar.bz2"
sparkle:version="162"
sparkle:shortVersionString="0.12.6"
sparkle:dsaSignature="MCwCFF3ViTcKEUFOLCWumRD05YbMpepyAhRq8oVXonWqpYwo1Vn0x0SNQ1EwUg=="
length="9310930"
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.13.0-164/VimR-v0.13.0-164.tar.bz2"
sparkle:version="164"
sparkle:shortVersionString="0.13.0"
sparkle:dsaSignature="MC0CFBisDu8IMsFxggGI65USNOTxlqDVAhUArhoMY5Y3vTuLKEkBkoDKUdgF52Y="
length="11830454"
type="application/octet-stream"/>
</item>
</channel>

9
resources/release-notes.md
View File

@ -1,3 +1,12 @@
# next
* Make pinch-zooming fast (enough) on Retina-displays.
* Make markdown previewing more robust against non-existing file.
# 0.13.0-164
* GH-339: Add a simple markdown previewer.
# 0.12.6-162
* GH-382: Bugfix: Sometimes the working directory is not set correctly when using the command line tool `vimr`.