[eog/wip/baedert/gtkimageview] scroll-view: Fold method into only caller
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog/wip/baedert/gtkimageview] scroll-view: Fold method into only caller
- Date: Sat, 19 Mar 2016 21:21:02 +0000 (UTC)
commit 45fc309d2276444083a11ae5b95ccd5c03b30385
Author: Timm Bäder <mail baedert org>
Date: Sat Mar 19 21:45:44 2016 +0100
scroll-view: Fold method into only caller
src/eog-scroll-view.c | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
---
diff --git a/src/eog-scroll-view.c b/src/eog-scroll-view.c
index dc71edc..b92f3bb 100644
--- a/src/eog-scroll-view.c
+++ b/src/eog-scroll-view.c
@@ -169,7 +169,6 @@ static void view_on_drag_data_get_cb (GtkWidget *widget,
GdkDragContext*drag_context,
GtkSelectionData *data, guint info,
guint time, gpointer user_data);
-static void _set_zoom_mode_internal (EogScrollView *view, EogZoomMode mode);
static gboolean eog_scroll_view_get_image_coords (EogScrollView *view, gint *x,
gint *y, gint *width,
gint *height);
@@ -2075,23 +2074,6 @@ eog_scroll_view_set_zoom_multiplier (EogScrollView *view,
g_object_notify (G_OBJECT (view), "zoom-multiplier");
}
-/* Helper to cause a redraw even if the zoom mode is unchanged */
-static void
-_set_zoom_mode_internal (EogScrollView *view, EogZoomMode mode)
-{
- gboolean notify = (mode != view->priv->zoom_mode);
-
-
- if (mode == EOG_ZOOM_MODE_SHRINK_TO_FIT)
- eog_scroll_view_zoom_fit (view);
- else
- view->priv->zoom_mode = mode;
-
- if (notify)
- g_object_notify (G_OBJECT (view), "zoom-mode");
-}
-
-
void
eog_scroll_view_set_zoom_mode (EogScrollView *view, EogZoomMode mode)
{
@@ -2100,7 +2082,12 @@ eog_scroll_view_set_zoom_mode (EogScrollView *view, EogZoomMode mode)
if (view->priv->zoom_mode == mode)
return;
- _set_zoom_mode_internal (view, mode);
+ if (mode == EOG_ZOOM_MODE_SHRINK_TO_FIT)
+ eog_scroll_view_zoom_fit (view);
+ else
+ view->priv->zoom_mode = mode;
+
+ g_object_notify (G_OBJECT (view), "zoom-mode");
}
EogZoomMode
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]