From 754c3261279b58118b16cfe9018613f058b59c9b Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 20 May 2003 11:46:28 +0000 Subject: Simplified and reorganised zoom. Implement a zoom control for the toolbar. 2003-05-19 Christian Persch Simplified and reorganised zoom. Implement a zoom control for the toolbar. * lib/widgets/ephy-zoom-action.h: * lib/widgets/ephy-zoom-action.c: * lib/widgets/ephy-zoom-control.h: * lib/widgets/ephy-zoom-control.c: New. A simple zoom control and a corresponding egg action. * lib/ephy-zoom.h: * lib/ephy-zoom.c: New. Define the supported zoom levels, plus some helper functions. * data/ui/epiphany-toolbar.xml.in: * src/toolbar.h: * src/toolbar.c: (toolbar_update_zoom_control), (zoom_to_level_cb), (toolbar_setup_actions): Hook up zoom control. * src/ephy-window.c: (toolbar_update_zoom_control): New. Updates toolbar zoom control and menu item sensitivity. * embed/mozilla/mozilla-embed.c: (impl_zoom_set, impl_zoom_get): * embed/ephy-embed.[ch]: (zoom_set), (zoom_get), (ephy_embed_zoom_set), (ephy_embed_zoom_get): * lib/ephy-marshal.list: * src/ephy-nautilus-view.c: (gnv_embed_zoom_change_cb), (gnv_zoomable_set_zoom_level_cb): * src/ephy-tab.c: (ephy_tab_zoom_changed_cb): * src/ephy-window.c: (ephy_window_set_zoom): Use float zoom factor instead of int percent for zoom. * src/ephy-nautilus-view.c: (ephy_nautilus_view_instance_init), (ephy_nautilus_view_class_init), (gnv_zoomable_set_zoom_level_cb), (gnv_zoomable_zoom_in_cb), (gnv_zoomable_zoom_out_cb), (gnv_zoomable_zoom_to_default_cb), (gnv_embed_zoom_change_cb): * src/window-commands.c: (window_cmd_view_zoom_in), (window_cmd_view_zoom_out), (window_cmd_view_zoom_normal): Simplified; use ephy-zoom.h where appropriate. --- embed/ephy-embed.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'embed/ephy-embed.c') diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index 6c6406d9c..c0858a32f 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -245,10 +245,10 @@ ephy_embed_base_init (gpointer g_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EphyEmbedClass, zoom_change), NULL, NULL, - g_cclosure_marshal_VOID__INT, + g_cclosure_marshal_VOID__FLOAT, G_TYPE_NONE, 1, - G_TYPE_INT); + G_TYPE_FLOAT); initialized = TRUE; } } @@ -411,7 +411,7 @@ ephy_embed_copy_page (EphyEmbed *dest, gresult ephy_embed_zoom_set (EphyEmbed *embed, - int zoom, + float zoom, gboolean reflow) { EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed); @@ -420,7 +420,7 @@ ephy_embed_zoom_set (EphyEmbed *embed, gresult ephy_embed_zoom_get (EphyEmbed *embed, - int *zoom) + float *zoom) { EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed); return klass->zoom_get (embed, zoom); -- cgit v1.2.3