Fifth commitHEAD0.1master

Signed-off-by: Mattias Andrée <m@maandree.se>

1 files changed, 12 insertions, 28 deletions

diff --git a/events.c b/events.c
index 7a45d66..f4f04cf 100644
--- a/events.c
+++ b/events.c
@@ -218,37 +218,21 @@ zoom_out_action(GtkAction *action, void *user)
 void
 normal_size_action(GtkToggleAction *action, void *user)
 {
+	(void) action;
 	(void) user;
-	set_zoom_fit(action, ZOOM_NORMAL);
-}
-
-void
-width_fit_action(GtkToggleAction *action, void *user)
-{
-	(void) user;
-	set_zoom_fit(action, ZOOM_FIT_WIDTH);
-}
-
-void
-height_fit_action(GtkToggleAction *action, void *user)
-{
-	(void) user;
-	set_zoom_fit(action, ZOOM_FIT_HEIGHT);
-}
-
-void
-window_fit_action(GtkToggleAction *action, void *user)
-{
-	(void) user;
-	set_zoom_fit(action, ZOOM_FIT_WINDOW);
+	clear_toggles(GROUP_ZOOM, NULL);
+	set_zoom_around_centre(normal_zoom);
 }
 
-void
-best_fit_action(GtkToggleAction *action, void *user)
-{
-	(void) user;
-	set_zoom_fit(action, ZOOM_BEST_FIT);
-}
+#define X(E, A, ...)\
+	void\
+	A(GtkToggleAction *action, void *user)\
+	{\
+		(void) user;\
+		set_zoom_fit(action, E);\
+	}
+LIST_ZOOM_MODES(X,)
+#undef X
 
 void
 next_action(GtkAction *action, void *user)