d6
/
uxn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed clamp from within set_zoom

This commit is contained in:
neauoire 2021-09-29 16:08:36 -07:00
parent 8d72c36123
commit 7f3a889771
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/uxnemu.c
View File

@ -141,12 +141,10 @@ set_window_size(SDL_Window *window, int w, int h)
static void static void
set_zoom(Uint8 scale) set_zoom(Uint8 scale)
{ {
if(scale == zoom) if(scale == zoom || !gWindow)
return; return;
zoom = clamp(scale, 1, 3);
reqdraw = 1;
if(gWindow)
set_window_size(gWindow, (ppu.width + PAD * 2) * zoom, (ppu.height + PAD * 2) * zoom); set_window_size(gWindow, (ppu.width + PAD * 2) * zoom, (ppu.height + PAD * 2) * zoom);
reqdraw = 1;
} }
static int static int
@ -329,7 +327,7 @@ doctrl(SDL_Event *event, int z)
case SDLK_DOWN: flag = 0x20; break; case SDLK_DOWN: flag = 0x20; break;
case SDLK_LEFT: flag = 0x40; break; case SDLK_LEFT: flag = 0x40; break;
case SDLK_RIGHT: flag = 0x80; break; case SDLK_RIGHT: flag = 0x80; break;
case SDLK_F1: if(z) set_zoom(zoom == 3 ? 1 : zoom + 1); break; case SDLK_F1: if(z) set_zoom(zoom > 2 ? 1 : zoom + 1); break;
case SDLK_F2: if(z) set_inspect(!devsystem->dat[0xe]); break; case SDLK_F2: if(z) set_inspect(!devsystem->dat[0xe]); break;
case SDLK_F3: if(z) capture_screen(); break; case SDLK_F3: if(z) capture_screen(); break;
} }
@ -601,7 +599,7 @@ main(int argc, char **argv)
/* set default zoom */ /* set default zoom */
SDL_GetCurrentDisplayMode(0, &DM); SDL_GetCurrentDisplayMode(0, &DM);
set_zoom(DM.w / 1280); set_zoom(clamp(DM.w / 1280, 1, 3));
/* get default zoom from flags */ /* get default zoom from flags */
for(i = 1; i < argc - 1; i++) { for(i = 1; i < argc - 1; i++) {
if(strcmp(argv[i], "-s") == 0) { if(strcmp(argv[i], "-s") == 0) {