Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-20 22:16:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify RenderGetViewportSize

Browse Source
This commit is contained in:
Sylvain Becker 2021-01-02 17:29:34 +01:00
parent 2af765da11
commit 3edf337d66
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/render/SDL_render.c
View File

@ -371,7 +371,7 @@ QueueCmdSetDrawColor(SDL_Renderer *renderer, const Uint8 r, const Uint8 g, const
{ {
const Uint32 color = ((a << 24) | (r << 16) | (g << 8) | b); const Uint32 color = ((a << 24) | (r << 16) | (g << 8) | b);
int retval = 0; int retval = 0;
if (!renderer->color_queued || (color != renderer->last_queued_color)) { if (!renderer->color_queued || (color != renderer->last_queued_color)) {
SDL_RenderCommand *cmd = AllocateRenderCommand(renderer); SDL_RenderCommand *cmd = AllocateRenderCommand(renderer);
retval = -1; retval = -1;
@ -640,7 +640,7 @@ SDL_RendererEventWatch(void *userdata, SDL_Event *event)
} }
} else if (event->window.event == SDL_WINDOWEVENT_MINIMIZED) { } else if (event->window.event == SDL_WINDOWEVENT_MINIMIZED) {
renderer->hidden = SDL_TRUE; renderer->hidden = SDL_TRUE;
} else if (event->window.event == SDL_WINDOWEVENT_RESTORED || } else if (event->window.event == SDL_WINDOWEVENT_RESTORED ||
event->window.event == SDL_WINDOWEVENT_MAXIMIZED) { event->window.event == SDL_WINDOWEVENT_MAXIMIZED) {
if (!(SDL_GetWindowFlags(window) & SDL_WINDOW_HIDDEN)) { if (!(SDL_GetWindowFlags(window) & SDL_WINDOW_HIDDEN)) {
renderer->hidden = SDL_FALSE; renderer->hidden = SDL_FALSE;
@ -687,7 +687,7 @@ SDL_RendererEventWatch(void *userdata, SDL_Event *event)
event->button.x = (int)(event->button.x / (scale.x * renderer->dpi_scale.x)); event->button.x = (int)(event->button.x / (scale.x * renderer->dpi_scale.x));
event->button.y = (int)(event->button.y / (scale.y * renderer->dpi_scale.y)); event->button.y = (int)(event->button.y / (scale.y * renderer->dpi_scale.y));
} }
} }
} else if (event->type == SDL_FINGERDOWN || } else if (event->type == SDL_FINGERDOWN ||
event->type == SDL_FINGERUP || event->type == SDL_FINGERUP ||
event->type == SDL_FINGERMOTION) { event->type == SDL_FINGERMOTION) {
@ -2156,13 +2156,10 @@ SDL_RenderGetViewport(SDL_Renderer * renderer, SDL_Rect * rect)
static void static void
RenderGetViewportSize(SDL_Renderer * renderer, SDL_FRect * rect) RenderGetViewportSize(SDL_Renderer * renderer, SDL_FRect * rect)
{ {
CHECK_RENDERER_MAGIC(renderer, ); rect->x = 0.0f;
if (rect) { rect->y = 0.0f;
rect->x = 0.0f; rect->w = renderer->viewport.w / renderer->scale.x;
rect->y = 0.0f; rect->h = renderer->viewport.h / renderer->scale.y;
rect->w = renderer->viewport.w / renderer->scale.x;
rect->h = renderer->viewport.h / renderer->scale.y;
}
} }
int int