celisej567/mcpe
1
0
Fork 0
mirror of https://github.com/celisej567/mcpe.git synced 2026-09-17 20:10:23 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small Tweaks

Browse Source
This commit is contained in:
TheBrokenRail
2023-11-02 18:55:24 -04:00
committed by iProgramInCpp
parent 118d28910d
commit 7771bc20a7
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platforms/sdl/main.cpp
View File

@@ -51,14 +51,14 @@ static int TranslateSDLKeyCodeToVirtual(int sdlCode)
#define TOUCH_IDS_SIZE (MAX_TOUCHES - 1) // ID 0 Is Reserved For The Mouse
struct touch_id_data {
bool active = false;
int id;
int device;
int finger;
};
static touch_id_data touch_ids[TOUCH_IDS_SIZE];
static char get_touch_id(int device, int finger) {
int real_id = (device * 100) + finger;
for (int i = 0; i < TOUCH_IDS_SIZE; i++) {
touch_id_data &data = touch_ids[i];
if (data.active && data.id == real_id) {
if (data.active && data.device == device && data.finger == finger) {
return i + 1;
}
}
@@ -68,7 +68,8 @@ static char get_touch_id(int device, int finger) {
touch_id_data &data = touch_ids[i];
if (!data.active) {
data.active = true;
data.id = real_id;
data.device = device;
data.finger = finger;
return i + 1;
}
}
@@ -241,7 +242,6 @@ static void resize()
}
// Main Loop
static bool is_first_window_resize = true;
static EM_BOOL main_loop(double time, void *user_data)
{
// Handle Events

4
source/client/gui/Screen.cpp
View File

@@ -295,12 +295,12 @@ void Screen::mouseReleased(int xPos, int yPos, int d)
if (m_pClickedButton)
{
m_pClickedButton->released(xPos, yPos);
if (m_pMinecraft->isTouchscreen())
if (m_pMinecraft->isTouchscreen() && button->clicked(m_pMinecraft, xPos, yPos))
{
m_pMinecraft->m_pSoundEngine->play("random.click");
buttonClicked(m_pClickedButton);
}
m_pClickedButton->released(xPos, yPos);
m_pClickedButton = nullptr;
}
}