qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-01 01:32:04 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix' GH-438

Browse Source
This commit is contained in:
Tae Won Ha 2017-05-04 21:51:57 +02:00
commit ae9e1fb87c
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
VimR/AppearancePref.swift
View File

@ -99,7 +99,10 @@ class AppearancePref: PrefPane, NSComboBoxDelegate, NSControlTextEditingDelegate
fontPopup.action = #selector(AppearancePref.fontPopupAction) fontPopup.action = #selector(AppearancePref.fontPopupAction)
// This takes approx. 0.8s - 1s on my machine... -_- // This takes approx. 0.8s - 1s on my machine... -_-
fontPopup.addItems(withTitles: self.fontManager.availableFontNames(with: .fixedPitchFontMask)!) DispatchQueue.global(qos: .background).async {
fontPopup.addItems(withTitles: self.fontManager.availableFontNames(with: .fixedPitchFontMask)!)
self.updateViews()
}
let sizeCombo = self.sizeCombo let sizeCombo = self.sizeCombo
sizeCombo.delegate = self sizeCombo.delegate = self

9
VimR/UiRoot.swift
View File

@ -20,12 +20,7 @@ class UiRoot: UiComponent {
self.fileMonitor = FileMonitor(source: source, emitter: emitter, state: state) self.fileMonitor = FileMonitor(source: source, emitter: emitter, state: state)
self.openQuicklyWindow = OpenQuicklyWindow(source: source, emitter: emitter, state: state) self.openQuicklyWindow = OpenQuicklyWindow(source: source, emitter: emitter, state: state)
self.prefWindow = PrefWindow(source: source, emitter: emitter, state: state)
// We dispatch the initialization of the pref window in the background since the population of the font list
// in the appearance pref pane takes approx. 0.8s - 1s on my machine... -_-
DispatchQueue.global(qos: .background).async {
self.prefWindow = PrefWindow(source: source, emitter: emitter, state: state)
}
source source
.observeOn(MainScheduler.instance) .observeOn(MainScheduler.instance)
@ -54,7 +49,7 @@ class UiRoot: UiComponent {
fileprivate let fileMonitor: FileMonitor fileprivate let fileMonitor: FileMonitor
fileprivate let openQuicklyWindow: OpenQuicklyWindow fileprivate let openQuicklyWindow: OpenQuicklyWindow
fileprivate var prefWindow: PrefWindow? fileprivate let prefWindow: PrefWindow
fileprivate var mainWindows = [String: MainWindow]() fileprivate var mainWindows = [String: MainWindow]()
fileprivate var subjectForMainWindows = [String: PublishSubject<MainWindow.State>]() fileprivate var subjectForMainWindows = [String: PublishSubject<MainWindow.State>]()

8
bin/build_vimr.sh
View File

@ -17,11 +17,11 @@ pushd neovim
ln -f -s ../local.mk . ln -f -s ../local.mk .
rm -rf build rm -rf build
make clean make distclean
echo "### Building nvim to get the runtime folder" echo "### Building nvim to get the runtime folder"
rm -rf /tmp/nvim
make CMAKE_FLAGS="-DCUSTOM_UI=0 -DCMAKE_INSTALL_PREFIX=/tmp/nvim" install make CMAKE_FLAGS="-DCUSTOM_UI=0 -DCMAKE_INSTALL_PREFIX=/tmp/nvim" install
cp -r /tmp/nvim/share/nvim/runtime .
rm -rf build rm -rf build
make clean make clean
@ -29,6 +29,10 @@ make clean
echo "### Building libnvim" echo "### Building libnvim"
make libnvim make libnvim
echo "### Copying runtime"
rm -rf runtime
cp -r /tmp/nvim/share/nvim/runtime .
popd popd
echo "### Updating carthage" echo "### Updating carthage"