diff options
author | Harry Jeffery <harry@exec64.co.uk> | 2015-11-27 13:53:19 +0000 |
---|---|---|
committer | Harry Jeffery <harry@exec64.co.uk> | 2015-11-27 13:53:19 +0000 |
commit | 5f6fb9fb0d5cf523d810e5d3812d8172c5eaa50e (patch) | |
tree | 4413a6a514d855609e4dfcfb80a3efc605f386b2 /src/main.c | |
parent | b17cb802d0b008e886e194972e661a65b0b28aa9 (diff) | |
download | imv-5f6fb9fb0d5cf523d810e5d3812d8172c5eaa50e.tar.gz |
Retrive viewport image dimensions from texture, not loader
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -309,24 +309,24 @@ int main(int argc, char** argv) case SDLK_EQUALS: case SDLK_i: case SDLK_UP: - imv_viewport_zoom(&view, &ldr, IMV_ZOOM_KEYBOARD, 1); + imv_viewport_zoom(&view, &tex, IMV_ZOOM_KEYBOARD, 1); break; case SDLK_MINUS: case SDLK_o: case SDLK_DOWN: - imv_viewport_zoom(&view, &ldr, IMV_ZOOM_KEYBOARD, -1); + imv_viewport_zoom(&view, &tex, IMV_ZOOM_KEYBOARD, -1); break; - case SDLK_a: imv_viewport_scale_to_actual(&view, &ldr);break; - case SDLK_r: imv_viewport_scale_to_window(&view, &ldr);break; - case SDLK_c: imv_viewport_center(&view, &ldr); break; + case SDLK_a: imv_viewport_scale_to_actual(&view, &tex);break; + case SDLK_r: imv_viewport_scale_to_window(&view, &tex);break; + case SDLK_c: imv_viewport_center(&view, &tex); break; case SDLK_j: imv_viewport_move(&view, 0, -50); break; case SDLK_k: imv_viewport_move(&view, 0, 50); break; case SDLK_h: imv_viewport_move(&view, 50, 0); break; case SDLK_l: imv_viewport_move(&view, -50, 0); break; case SDLK_x: imv_navigator_remove_current_path(&nav); break; case SDLK_f: imv_viewport_toggle_fullscreen(&view); break; - case SDLK_PERIOD: imv_loader_load_next_frame(&ldr); break; - case SDLK_SPACE: imv_viewport_toggle_playing(&view, &ldr);break; + case SDLK_PERIOD: imv_loader_load_next_frame(&ldr); break; + case SDLK_SPACE: imv_viewport_toggle_playing(&view, &tex);break; case SDLK_p: puts(imv_navigator_get_current_path(&nav));break; case SDLK_d: g_options.overlay = !g_options.overlay; @@ -335,7 +335,7 @@ int main(int argc, char** argv) } break; case SDL_MOUSEWHEEL: - imv_viewport_zoom(&view, &ldr, IMV_ZOOM_MOUSE, e.wheel.y); + imv_viewport_zoom(&view, &tex, IMV_ZOOM_MOUSE, e.wheel.y); break; case SDL_MOUSEMOTION: if(e.motion.state & SDL_BUTTON_LMASK) { @@ -343,7 +343,7 @@ int main(int argc, char** argv) } break; case SDL_WINDOWEVENT: - imv_viewport_updated(&view, &ldr); + imv_viewport_updated(&view, &tex); break; } } |