mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-11-11 01:53:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of pwmt.org:zathura into develop

Browse Source
This commit is contained in:
Sebastian Ramacher 2012-02-08 21:37:08 +01:00
commit fea48f3438
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.c
View File

@ -132,6 +132,8 @@ config_load_default(zathura_t* zathura)
girara_shortcut_add(gsession, 0, 0, "zO", sc_zoom, FULLSCREEN, ZOOM_OUT, NULL); girara_shortcut_add(gsession, 0, 0, "zO", sc_zoom, FULLSCREEN, ZOOM_OUT, NULL);
girara_shortcut_add(gsession, 0, 0, "z0", sc_zoom, NORMAL, ZOOM_ORIGINAL, NULL); girara_shortcut_add(gsession, 0, 0, "z0", sc_zoom, NORMAL, ZOOM_ORIGINAL, NULL);
girara_shortcut_add(gsession, 0, 0, "z0", sc_zoom, FULLSCREEN, ZOOM_ORIGINAL, NULL); girara_shortcut_add(gsession, 0, 0, "z0", sc_zoom, FULLSCREEN, ZOOM_ORIGINAL, NULL);
girara_shortcut_add(gsession, 0, GDK_equal, NULL, sc_zoom, NORMAL, ZOOM_SPECIFIC, NULL);
girara_shortcut_add(gsession, 0, GDK_equal, NULL, sc_zoom, FULLSCREEN, ZOOM_SPECIFIC, NULL);
/* mouse events */ /* mouse events */
girara_mouse_event_add(gsession, 0, 0, sc_mouse_scroll, NORMAL, 0, NULL); girara_mouse_event_add(gsession, 0, 0, sc_mouse_scroll, NORMAL, 0, NULL);

13
shortcuts.c
View File

@ -727,7 +727,7 @@ sc_quit(girara_session_t* session, girara_argument_t* UNUSED(argument),
bool bool
sc_zoom(girara_session_t* session, girara_argument_t* argument, girara_event_t* sc_zoom(girara_session_t* session, girara_argument_t* argument, girara_event_t*
UNUSED(event), unsigned int UNUSED(t)) UNUSED(event), unsigned int t)
{ {
g_return_val_if_fail(session != NULL, false); g_return_val_if_fail(session != NULL, false);
g_return_val_if_fail(session->global.data != NULL, false); g_return_val_if_fail(session->global.data != NULL, false);
@ -741,14 +741,25 @@ sc_zoom(girara_session_t* session, girara_argument_t* argument, girara_event_t*
float zoom_step = value / 100.0f; float zoom_step = value / 100.0f;
/* specify new zoom value */
if (argument->n == ZOOM_IN) { if (argument->n == ZOOM_IN) {
zathura->document->scale += zoom_step; zathura->document->scale += zoom_step;
} else if (argument->n == ZOOM_OUT) { } else if (argument->n == ZOOM_OUT) {
zathura->document->scale -= zoom_step; zathura->document->scale -= zoom_step;
} else if (argument->n == ZOOM_SPECIFIC) {
fprintf(stderr, "t: %d\n", t);
zathura->document->scale = t / 100.0f;
} else { } else {
zathura->document->scale = 1.0; zathura->document->scale = 1.0;
} }
/* zoom limitations */
if (zathura->document->scale < 0.1f) {
zathura->document->scale = 0.1f;
} else if (zathura->document->scale > 10.0f) {
zathura->document->scale = 10.0f;
}
render_all(zathura); render_all(zathura);
return false; return false;