aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorTse Kit Yam <me@kytse.com>2016-08-29 22:35:52 +1000
committerTse Kit Yam <me@kytse.com>2016-08-29 22:35:52 +1000
commit93876550b9a3c21f4f67253be4ed2c7cb1824c2a (patch)
tree60954fa40c8f3840601d3b3d863c9065d64ecc45
parentc305220ceb5576952f611bf1ca547a363276b3ca (diff)
downloadscintilla-mirror-93876550b9a3c21f4f67253be4ed2c7cb1824c2a.tar.gz
Bug [#1854]. Fix: cannot get original input char on Mac for some input-modifiers
combinations e.g. Option + e => empty char, Control + k => a char with ascii code 11
-rw-r--r--cocoa/ScintillaCocoa.mm2
-rw-r--r--doc/ScintillaHistory.html5
2 files changed, 6 insertions, 1 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 4aa1d209c..ec9844bb0 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -2150,7 +2150,7 @@ static int TranslateModifierFlags(NSUInteger modifiers)
bool ScintillaCocoa::KeyboardInput(NSEvent* event)
{
// For now filter out function keys.
- NSString* input = [event characters];
+ NSString* input = [event charactersIgnoringModifiers];
bool handled = false;
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 64197c744..a73ba9def 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -493,6 +493,7 @@
<td>Chris Mayo</td>
</tr><tr>
<td>Van de Bugger</td>
+ <td>Tse Kit Yam</td>
</tr>
</table>
<p>
@@ -540,6 +541,10 @@
<a href="http://sourceforge.net/p/scintilla/bugs/1842/">Bug #1842</a>.
</li>
<li>
+ Fix key binding bug on Cocoa for control+.
+ <a href="http://sourceforge.net/p/scintilla/bugs/1854/">Bug #1854</a>.
+ </li>
+ <li>
Fix scroll bar size warnings on GTK+ caused by #1831.
<a href="http://sourceforge.net/p/scintilla/bugs/1851/">Bug #1851</a>.
</li>