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

This commit is contained in:
Moritz Lipp 2012-03-24 18:27:14 +01:00
commit 8e3ec89adb
2 changed files with 19 additions and 4 deletions

View file

@ -80,9 +80,9 @@ zathura_page_widget_class_init(ZathuraPageClass* class)
GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(class); GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(class);
#if GTK_MAJOR_VERSION == 3 #if GTK_MAJOR_VERSION == 3
widget_class->draw = zathura_page_widget_draw; widget_class->draw = zathura_page_widget_draw;
#else #else
widget_class->expose_event = zathura_page_widget_expose; widget_class->expose_event = zathura_page_widget_expose;
#endif #endif
widget_class->size_allocate = zathura_page_widget_size_allocate; widget_class->size_allocate = zathura_page_widget_size_allocate;
widget_class->button_press_event = cb_zathura_page_widget_button_press_event; widget_class->button_press_event = cb_zathura_page_widget_button_press_event;
widget_class->button_release_event = cb_zathura_page_widget_button_release_event; widget_class->button_release_event = cb_zathura_page_widget_button_release_event;
@ -128,6 +128,7 @@ zathura_page_widget_init(ZathuraPage* widget)
priv->images = NULL; priv->images = NULL;
priv->images_got = false; priv->images_got = false;
priv->current_image = NULL; priv->current_image = NULL;
priv->last_view = g_get_real_time();
g_static_mutex_init(&(priv->lock)); g_static_mutex_init(&(priv->lock));
/* we want mouse events */ /* we want mouse events */

View file

@ -494,12 +494,26 @@ Defines the opacity of a highlighted element
page-padding page-padding
^^^^^^^^^^^^ ^^^^^^^^^^^^
The page padding defines the gap in pixels between each rendered page and can The page padding defines the gap in pixels between each rendered page.
not be changed during runtime.
* Value-type: Integer * Value-type: Integer
* Default value: 1 * Default value: 1
page-store-threshold
^^^^^^^^^^^^^^^^^^^^
Pages that are not visible get unloaded after some time. Every page that has not
been visible for page-store-treshold seconds will be unloaded.
* Value-type: Integer
* Default value: 30
page-store-interval
^^^^^^^^^^^^^^^^^^^
Defines the amount of seconds between the check to unload invisible pages.
* Value-type: Integer
* Default value: 30
pages-per-row pages-per-row
^^^^^^^^^^^^^ ^^^^^^^^^^^^^
Defines the number of pages that are rendered next to each other in a row. Defines the number of pages that are rendered next to each other in a row.