Skip to content
This repository was archived by the owner on Apr 1, 2020. It is now read-only.

Feature/set press and hold on macOS #2331

Open
akinsho wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Feature/set press and hold on macOS #2331

Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
641509f
pull upstream
akinsho Jun 5, 2018
8e8272a
Merge branch 'master' of https://github.com/onivim/oni
akinsho Jun 10, 2018
efdd77e
set user default to press and hold on ios
akinsho Jun 18, 2018
1496139
add check to only set if not already set
akinsho Jun 18, 2018
3f290d3
make minor change hopefully this picks up submodule changes
akinsho Jun 19, 2018
3efbd65
Merge branch 'master' of https://github.com/onivim/oni
akinsho Jun 19, 2018
bebd00c
Merge branch 'master' into feature/set-press-and-hold-on-ios
akinsho Jun 19, 2018
37f100f
move call to on app ready
akinsho Jun 21, 2018
77dfe67
fixed arguments and check
akinsho Jul 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion main/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as minimist from "minimist"
import * as path from "path"

import { app, BrowserWindow, ipcMain, Menu } from "electron"
import { app, BrowserWindow, ipcMain, Menu, systemPreferences } from "electron"

import * as PersistentSettings from "electron-settings"

Expand Down Expand Up @@ -182,6 +182,17 @@ export function createWindow(
width: windowState.bounds.width,
})

if (process.platform.includes("darwin")) {
const pressAndHold: boolean = systemPreferences.getUserDefault(
"ApplePressAndHoldEnabled",
"boolean",
)

if (!pressAndHold) {

@CrossR CrossR Jul 2, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be pressAndHold (no !), since if ApplePressAndHoldEnabled is enabled, we want to disable it.

systemPreferences.setUserDefault("ApplePressAndHoldEnabled", "boolean", "true")

@bryphe bryphe Jun 19, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, super cool! Didn't know we could do this. This will alleviate a common pain point on OSX. Nice find @akin909 馃挴

@CrossR CrossR Jul 2, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be false not "true", since it needs to be a bool and it should be setting this value to false.

@akinsho akinsho Jul 2, 2018

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah that bit is quite confusing as the type for it from electron and the docs state the argument is a string got stuck on that for a while, seems like an issue for electron and their types for this function

}
}

if (windowState.isMaximized) {
currentWindow.maximize()
}
Expand Down