diff options
| author | ouwou <26526779+ouwou@users.noreply.github.com> | 2023-06-22 01:13:05 -0400 |
|---|---|---|
| committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2023-06-22 01:13:05 -0400 |
| commit | 686d79eca62bbf9b3da22eb170bdc6bb82622370 (patch) | |
| tree | 23385c3c3f459bfca24891eac94ad7bcce84de16 /src | |
| parent | 85bc7b95f76cbc27e414c9f9182e51052b259b20 (diff) | |
| parent | 2a0305e93d8bbf636802ed8235b136c85c789a5a (diff) | |
| download | abaddon-portaudio-686d79eca62bbf9b3da22eb170bdc6bb82622370.tar.gz abaddon-portaudio-686d79eca62bbf9b3da22eb170bdc6bb82622370.zip | |
Merge branch 'master' of https://github.com/uowuo/abaddon
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio/ma_impl.cpp | 3 | ||||
| -rw-r--r-- | src/components/chatinput.cpp | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/audio/ma_impl.cpp b/src/audio/ma_impl.cpp index a83ddaf..531b24f 100644 --- a/src/audio/ma_impl.cpp +++ b/src/audio/ma_impl.cpp @@ -1,4 +1,7 @@ #ifdef WITH_MINIAUDIO #define MINIAUDIO_IMPLEMENTATION + #ifdef __APPLE__ + #define MA_NO_RUNTIME_LINKING + #endif #include <miniaudio.h> #endif diff --git a/src/components/chatinput.cpp b/src/components/chatinput.cpp index d19ac4b..28ed1ea 100644 --- a/src/components/chatinput.cpp +++ b/src/components/chatinput.cpp @@ -41,9 +41,15 @@ bool ChatInputText::ProcessKeyPress(GdkEventKey *event) { return true; } +#ifdef __APPLE__ + if ((event->state & GDK_MOD2_MASK) && event->keyval == GDK_KEY_v) { + return CheckHandleClipboardPaste(); + } +#else if ((event->state & GDK_CONTROL_MASK) && event->keyval == GDK_KEY_v) { return CheckHandleClipboardPaste(); } +#endif if (event->keyval == GDK_KEY_Return) { if (event->state & GDK_SHIFT_MASK) |