Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update external frameworks' plist file #1036

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -16,5 +16,9 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
</dict>
</plist>
Expand Up @@ -16,5 +16,9 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
</dict>
</plist>
Expand Up @@ -16,5 +16,9 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
</dict>
</plist>
Expand Up @@ -16,5 +16,9 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
</dict>
</plist>
Expand Up @@ -16,5 +16,9 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
</dict>
</plist>
Expand Up @@ -16,5 +16,9 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
</dict>
</plist>
Expand Up @@ -16,5 +16,9 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
</dict>
</plist>
10 changes: 6 additions & 4 deletions src/SFML/Window/OSX/HIDInputManager.mm
Expand Up @@ -763,14 +763,16 @@
case 0x2c: return sf::Keyboard::Slash;
case 0x2a: return sf::Keyboard::BackSlash;

#warning sf::Keyboard::Tilde might be in conflict with some other key.
//#warning sf::Keyboard::Tilde might be in conflict with some other key.//?DELETE?
// 0x0a is for "Non-US Backslash" according to HID Calibrator,
// a sample provided by Apple.
case 0x0a: return sf::Keyboard::Tilde;
//case 0x0a: return sf::Keyboard::Tilde;
case 0x32: return sf::Keyboard::Tilde;

case 0x51: /* keypad */ return sf::Keyboard::Equal;
case 0x18: /* keyboard */ return sf::Keyboard::Equal;
case 0x32: return sf::Keyboard::Dash;
//case 0x32: return sf::Keyboard::Dash;
ase 0x1b: return sf::Keyboard::Dash;
case 0x31: return sf::Keyboard::Space;
case 0x4c: /* keypad */ return sf::Keyboard::Return;
case 0x24: /* keyboard */ return sf::Keyboard::Return;
Expand Down Expand Up @@ -855,7 +857,7 @@

case NSPauseFunctionKey: return sf::Keyboard::Pause;

#warning keycode 0x1b is not bound to any key.
//#warning keycode 0x1b is not bound to any key.//?DELETE?
// This key is ' on CH-FR, ) on FR and - on US layouts.

// An unknown key.
Expand Down