mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-10-13 21:35:59 +00:00
Cleanup add brace (#6545)
* Add braces after if conditions * More add braces after if conditions * Add braces after while() conditions * Fix compilation because of macro being modified * Add braces to for loop * Add braces after if/goto * Move comments up * Remove extra () in the 'return ...;' statements * More remove extra () in the 'return ...;' statements * More remove extra () in the 'return ...;' statements after merge * Fix inconsistent patterns are xxx == NULL vs !xxx * More "{}" for "if() break;" and "if() continue;" * More "{}" after if() short statement * More "{}" after "if () return;" statement * More fix inconsistent patterns are xxx == NULL vs !xxx * Revert some modificaion on SDL_RLEaccel.c * SDL_RLEaccel: no short statement * Cleanup 'if' where the bracket is in a new line * Cleanup 'while' where the bracket is in a new line * Cleanup 'for' where the bracket is in a new line * Cleanup 'else' where the bracket is in a new line
This commit is contained in:
@@ -772,8 +772,9 @@ Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent *touchEvent, vo
|
||||
SDL_FingerID id;
|
||||
float x, y;
|
||||
|
||||
if (!touchEvent->touches[i].isChanged)
|
||||
if (!touchEvent->touches[i].isChanged) {
|
||||
continue;
|
||||
}
|
||||
|
||||
id = touchEvent->touches[i].identifier;
|
||||
x = touchEvent->touches[i].targetX / client_w;
|
||||
@@ -857,14 +858,11 @@ Emscripten_HandleFullscreenChange(int eventType, const EmscriptenFullscreenChang
|
||||
SDL_WindowData *window_data = userData;
|
||||
SDL_VideoDisplay *display;
|
||||
|
||||
if(fullscreenChangeEvent->isFullscreen)
|
||||
{
|
||||
if (fullscreenChangeEvent->isFullscreen) {
|
||||
window_data->window->flags |= window_data->requested_fullscreen_mode;
|
||||
|
||||
window_data->requested_fullscreen_mode = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
window_data->window->flags &= ~FULLSCREEN_MASK;
|
||||
|
||||
/* reset fullscreen window if the browser left fullscreen */
|
||||
@@ -892,15 +890,13 @@ Emscripten_HandleResize(int eventType, const EmscriptenUiEvent *uiEvent, void *u
|
||||
}
|
||||
}
|
||||
|
||||
if(!(window_data->window->flags & FULLSCREEN_MASK))
|
||||
{
|
||||
if (!(window_data->window->flags & FULLSCREEN_MASK)) {
|
||||
/* this will only work if the canvas size is set through css */
|
||||
if(window_data->window->flags & SDL_WINDOW_RESIZABLE)
|
||||
{
|
||||
if (window_data->window->flags & SDL_WINDOW_RESIZABLE) {
|
||||
double w = window_data->window->w;
|
||||
double h = window_data->window->h;
|
||||
|
||||
if(window_data->external_size) {
|
||||
if (window_data->external_size) {
|
||||
emscripten_get_element_css_size(window_data->canvas_id, &w, &h);
|
||||
}
|
||||
|
||||
@@ -930,8 +926,7 @@ Emscripten_HandleCanvasResize(int eventType, const void *reserved, void *userDat
|
||||
/*this is used during fullscreen changes*/
|
||||
SDL_WindowData *window_data = userData;
|
||||
|
||||
if(window_data->fullscreen_resize)
|
||||
{
|
||||
if (window_data->fullscreen_resize) {
|
||||
double css_w, css_h;
|
||||
emscripten_get_element_css_size(window_data->canvas_id, &css_w, &css_h);
|
||||
SDL_SendWindowEvent(window_data->window, SDL_WINDOWEVENT_RESIZED, css_w, css_h);
|
||||
@@ -986,7 +981,9 @@ Emscripten_RegisterEventHandlers(SDL_WindowData *data)
|
||||
|
||||
/* Keyboard events are awkward */
|
||||
keyElement = SDL_GetHint(SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT);
|
||||
if (!keyElement) keyElement = EMSCRIPTEN_EVENT_TARGET_WINDOW;
|
||||
if (keyElement == NULL) {
|
||||
keyElement = EMSCRIPTEN_EVENT_TARGET_WINDOW;
|
||||
}
|
||||
|
||||
emscripten_set_keydown_callback(keyElement, data, 0, Emscripten_HandleKey);
|
||||
emscripten_set_keyup_callback(keyElement, data, 0, Emscripten_HandleKey);
|
||||
@@ -1028,7 +1025,7 @@ Emscripten_UnregisterEventHandlers(SDL_WindowData *data)
|
||||
emscripten_set_pointerlockchange_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, NULL, 0, NULL);
|
||||
|
||||
target = SDL_GetHint(SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT);
|
||||
if (!target) {
|
||||
if (target == NULL) {
|
||||
target = EMSCRIPTEN_EVENT_TARGET_WINDOW;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user