1
1
mirror of https://github.com/qvacua/vimr.git synced 2024-12-26 07:13:24 +03:00

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

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

View File

@ -14,7 +14,7 @@ import os
class PerfTester {
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"] {
guard let fileUrl = Bundle(for: PerfTester.self)

View File

@ -164,6 +164,10 @@ class AppearancePref: PrefPane, NSComboBoxDelegate, NSControlTextEditingDelegate
let characterspacingTitle = self.titleTextField(title: "Character Spacing:")
let characterspacingField = self.characterspacingField
let characterspacingInfo = self.infoTextField(
markdown: "Character spacing not equal to `1` will likely break ligatures."
)
let ligatureCheckbox = self.ligatureCheckbox
self.configureCheckbox(button: ligatureCheckbox,
title: "Use Ligatures",
@ -203,6 +207,7 @@ class AppearancePref: PrefPane, NSComboBoxDelegate, NSControlTextEditingDelegate
self.addSubview(linespacingField)
self.addSubview(characterspacingTitle)
self.addSubview(characterspacingField)
self.addSubview(characterspacingInfo)
self.addSubview(ligatureCheckbox)
self.addSubview(previewScrollView)
@ -259,7 +264,10 @@ class AppearancePref: PrefPane, NSComboBoxDelegate, NSControlTextEditingDelegate
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)
previewScrollView.autoSetDimension(.height, toSize: 200, relation: .greaterThanOrEqual)

View File

@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8">
<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>
// Scrolling
const sourceposRegex = /(\d+):(\d+)-(\d+):(\d+)/;

View File

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