diff options
author | bunnei <bunneidev@gmail.com> | 2020-02-27 19:51:55 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-27 19:51:55 -0500 |
commit | 969357af1a26e74eaa5b0cec677d929bca94dc57 (patch) | |
tree | 59a8bb28215dfbdc817227e4b0b7ea37e6f5ef70 /src/yuzu/main.h | |
parent | e1efab1f510c47a9f637601db425527c15e0d838 (diff) | |
parent | ebbfe735574a74122f4a52eac9631ba19cd8f013 (diff) |
Merge pull request #3430 from bunnei/split-presenter
Port citra-emu/citra#4940: "Split Presentation thread from Render thread"
Diffstat (limited to 'src/yuzu/main.h')
-rw-r--r-- | src/yuzu/main.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 8eba2172c..a67125567 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -78,6 +78,9 @@ public: std::unique_ptr<DiscordRPC::DiscordInterface> discord_rpc; + bool DropAction(QDropEvent* event); + void AcceptDropEvent(QDropEvent* event); + signals: /** @@ -264,8 +267,4 @@ protected: void dropEvent(QDropEvent* event) override; void dragEnterEvent(QDragEnterEvent* event) override; void dragMoveEvent(QDragMoveEvent* event) override; - - // Overrides used to forward signals to the render window when the focus moves out. - void keyPressEvent(QKeyEvent* event) override; - void keyReleaseEvent(QKeyEvent* event) override; }; |