mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-05-08 14:47:24 +00:00
Merge pull request #164 from realffqq/feat/restore-java-gui
Some checks are pending
Build Linux Release / build-linux (push) Waiting to run
Some checks are pending
Build Linux Release / build-linux (push) Waiting to run
(feat/restore-java-gui) fix: pass ESC keypress to screen
This commit is contained in:
commit
ae00c4719f
|
|
@ -2106,7 +2106,9 @@ void Minecraft::pauseGame()
|
|||
{
|
||||
if (screen != NULL)
|
||||
{
|
||||
setScreen(NULL);
|
||||
// 4jcraft: Pass the keypress to the screen
|
||||
// normally this would've been done in updateEvents(), but it works better here (for now atleast)
|
||||
screen->keyPressed(0, Keyboard::KEY_ESCAPE);
|
||||
return;
|
||||
}
|
||||
#ifdef ENABLE_JAVA_GUIS
|
||||
|
|
|
|||
|
|
@ -23,10 +23,9 @@ public:
|
|||
|
||||
Screen(); // 4J added
|
||||
virtual void render(int xm, int ym, float a);
|
||||
protected:
|
||||
virtual void keyPressed(wchar_t eventCharacter, int eventKey);
|
||||
public:
|
||||
static std::wstring getClipboard();
|
||||
virtual void keyPressed(wchar_t eventCharacter, int eventKey);
|
||||
static std::wstring getClipboard();
|
||||
static void setClipboard(const std::wstring& str);
|
||||
private:
|
||||
Button *clickedButton;
|
||||
|
|
|
|||
Loading…
Reference in a new issue