qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-27 15:53:31 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into update-neovim

Browse Source
This commit is contained in:
Tae Won Ha 2019-08-18 14:00:45 +02:00
commit 0f6478cc78
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NvimView/DrawerPerf/PerfTester.swift
View File

@ -14,7 +14,7 @@ import os
class PerfTester { class PerfTester {
init() { init() {
self.cellSize = FontUtils.cellSize(of: self.font, linespacing: 1.25) self.cellSize = FontUtils.cellSize(of: self.font, linespacing: 1.25, characterspacing: 1)
for name in ["0", "1", "2"] { for name in ["0", "1", "2"] {
guard let fileUrl = Bundle(for: PerfTester.self) guard let fileUrl = Bundle(for: PerfTester.self)

10
VimR/VimR/AppearancePref.swift
View File

@ -164,6 +164,10 @@ class AppearancePref: PrefPane, NSComboBoxDelegate, NSControlTextEditingDelegate
let characterspacingTitle = self.titleTextField(title: "Character Spacing:") let characterspacingTitle = self.titleTextField(title: "Character Spacing:")
let characterspacingField = self.characterspacingField let characterspacingField = self.characterspacingField
let characterspacingInfo = self.infoTextField(
markdown: "Character spacing not equal to `1` will likely break ligatures."
)
let ligatureCheckbox = self.ligatureCheckbox let ligatureCheckbox = self.ligatureCheckbox
self.configureCheckbox(button: ligatureCheckbox, self.configureCheckbox(button: ligatureCheckbox,
title: "Use Ligatures", title: "Use Ligatures",
@ -203,6 +207,7 @@ class AppearancePref: PrefPane, NSComboBoxDelegate, NSControlTextEditingDelegate
self.addSubview(linespacingField) self.addSubview(linespacingField)
self.addSubview(characterspacingTitle) self.addSubview(characterspacingTitle)
self.addSubview(characterspacingField) self.addSubview(characterspacingField)
self.addSubview(characterspacingInfo)
self.addSubview(ligatureCheckbox) self.addSubview(ligatureCheckbox)
self.addSubview(previewScrollView) self.addSubview(previewScrollView)
@ -259,7 +264,10 @@ class AppearancePref: PrefPane, NSComboBoxDelegate, NSControlTextEditingDelegate
self.characterspacingAction() self.characterspacingAction()
} }
ligatureCheckbox.autoPinEdge(.top, to: .bottom, of: characterspacingField, withOffset: 18) characterspacingInfo.autoPinEdge(.left, to: .left, of: characterspacingField)
characterspacingInfo.autoPinEdge(.top, to: .bottom, of: characterspacingField, withOffset: 5)
ligatureCheckbox.autoPinEdge(.top, to: .bottom, of: characterspacingInfo, withOffset: 18)
ligatureCheckbox.autoPinEdge(.left, to: .right, of: fontTitle, withOffset: 5) ligatureCheckbox.autoPinEdge(.left, to: .right, of: fontTitle, withOffset: 5)
previewScrollView.autoSetDimension(.height, toSize: 200, relation: .greaterThanOrEqual) previewScrollView.autoSetDimension(.height, toSize: 200, relation: .greaterThanOrEqual)

1
VimR/VimR/markdown/template.html
View File

@ -3,6 +3,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="github-markdown.css"> <link rel="stylesheet" href="github-markdown.css">
<script src='https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML' async></script>
<script> <script>
// Scrolling // Scrolling
const sourceposRegex = /(\d+):(\d+)-(\d+):(\d+)/; const sourceposRegex = /(\d+):(\d+)-(\d+):(\d+)/;

4
resources/release-notes.md
View File

@ -1,3 +1,7 @@
# ???
* Add MathJax to Markdown preview
# 0.27.5 # 0.27.5
* Dependencies updates: * Dependencies updates: