wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

print preview: fix logic for forward button sensitivity (#292) 

Previously, the logic used to set the sensitivity of the forward
navigation button failed to consider when multiple pages are shown.
This resulted in the forward button being sensitive in some cases,
even if all pages, or the last page were shown. With this commit, it
is now updated properly.

Also, when the rows and columns are changed, the current page is now
changed to the nearest multiple of rows*cols so that the current page
is still shown, but navigating back to the beginning and then forward
again will be consistent.
This commit is contained in:
Stephen Collins 2019-05-05 03:26:58 -06:00 committed by Clement Lefebvre
parent 67892da099
commit 992ca7a3ec
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xed/xed-print-preview.c
View File

@ -82,6 +82,9 @@ struct _XedPrintPreviewPrivate
G_DEFINE_TYPE (XedPrintPreview, xed_print_preview, GTK_TYPE_BOX) G_DEFINE_TYPE (XedPrintPreview, xed_print_preview, GTK_TYPE_BOX)
static void goto_page (XedPrintPreview *preview,
gint page);
static void static void
xed_print_preview_get_property (GObject *object, xed_print_preview_get_property (GObject *object,
guint prop_id, guint prop_id,
@ -173,6 +176,7 @@ set_rows_and_cols (XedPrintPreview *preview,
preview->priv->rows = rows; preview->priv->rows = rows;
preview->priv->cols = cols; preview->priv->cols = cols;
update_layout_size (preview); update_layout_size (preview);
goto_page (preview, preview->priv->cur_page - (preview->priv->cur_page % (preview->priv->rows * preview->priv->cols)));
} }
/* get the paper size in points: these must be used only /* get the paper size in points: these must be used only
@ -312,7 +316,7 @@ goto_page (XedPrintPreview *preview,
gtk_widget_set_sensitive (GTK_WIDGET (preview->priv->prev), (page > 0) && (preview->priv->n_pages > 1)); gtk_widget_set_sensitive (GTK_WIDGET (preview->priv->prev), (page > 0) && (preview->priv->n_pages > 1));
gtk_widget_set_sensitive (GTK_WIDGET (preview->priv->next), gtk_widget_set_sensitive (GTK_WIDGET (preview->priv->next),
(page != (preview->priv->n_pages - 1)) && (page < (preview->priv->n_pages - preview->priv->rows * preview->priv->cols)) &&
(preview->priv->n_pages > 1)); (preview->priv->n_pages > 1));
if (page != preview->priv->cur_page) if (page != preview->priv->cur_page)