MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OSX: use Cmd for Copy-Paste

master
MoNTE48 2021-12-28 09:58:56 +01:00
parent eaa07379cc
commit a3dd0c1399
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/Irrlicht/CIrrDeviceOSX.mm
View File

@ -952,7 +952,7 @@ bool CIrrDeviceMacOSX::run()
case NSFlagsChanged:
ievent.EventType = irr::EET_KEY_INPUT_EVENT;
ievent.KeyInput.Shift = ([event modifierFlags] & NSShiftKeyMask) != 0;
ievent.KeyInput.Control = ([event modifierFlags] & NSControlKeyMask) != 0;
ievent.KeyInput.Control = ([event modifierFlags] & NSCommandKeyMask) != 0;
if (IsShiftDown != ievent.KeyInput.Shift)
{
@ -1185,7 +1185,7 @@ void CIrrDeviceMacOSX::postKeyEvent(void *event,irr::SEvent &ievent,bool pressed
ievent.KeyInput.Key = (irr::EKEY_CODE)mkey;
ievent.KeyInput.PressedDown = pressed;
ievent.KeyInput.Shift = ([(NSEvent *)event modifierFlags] & NSShiftKeyMask) != 0;
ievent.KeyInput.Control = ([(NSEvent *)event modifierFlags] & NSControlKeyMask) != 0;
ievent.KeyInput.Control = ([(NSEvent *)event modifierFlags] & NSCommandKeyMask) != 0;
ievent.KeyInput.Char = mchar;
if (skipCommand)
@ -1226,7 +1226,7 @@ void CIrrDeviceMacOSX::postMouseEvent(void *event,irr::SEvent &ievent)
if (post)
{
ievent.MouseInput.Shift = ([(NSEvent *)event modifierFlags] & NSShiftKeyMask) != 0;
ievent.MouseInput.Control = ([(NSEvent *)event modifierFlags] & NSControlKeyMask) != 0;
ievent.MouseInput.Control = ([(NSEvent *)event modifierFlags] & NSCommandKeyMask) != 0;
ievent.MouseInput.X *= NativeScale;
ievent.MouseInput.Y *= NativeScale;

6
source/Irrlicht/COSOperator.cpp
View File

@ -89,8 +89,8 @@ void COSOperator::copyToClipboard(const c8* text) const
{
str = [NSString stringWithCString:text encoding:NSWindowsCP1252StringEncoding];
board = [NSPasteboard generalPasteboard];
[board declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:NSApp];
[board setString:str forType:NSStringPboardType];
[board declareTypes:@[NSPasteboardTypeString] owner:NSApp];
[board setString:str forType:NSPasteboardTypeString];
}
#elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)
@ -126,7 +126,7 @@ const c8* COSOperator::getTextFromClipboard() const
char* result = 0;
board = [NSPasteboard generalPasteboard];
str = [board stringForType:NSStringPboardType];
str = [board stringForType:NSPasteboardTypeString];
if (str != nil)
result = (char*)[str cStringUsingEncoding:NSWindowsCP1252StringEncoding];