diff options
| author | Christian Persch <chpe+gnomebugz@stud.uni-saarland.de> | 2003-05-20 19:46:28 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-05-20 19:46:28 +0800 |
| commit | 754c3261279b58118b16cfe9018613f058b59c9b (patch) | |
| tree | d23770eeefb5b947ee44a27fc3cbad04f026de86 /src/window-commands.c | |
| parent | bc555495c56dc8836db5ac7a4f3f6b5772e315d6 (diff) | |
| download | gsoc2013-epiphany-754c3261279b58118b16cfe9018613f058b59c9b.tar gsoc2013-epiphany-754c3261279b58118b16cfe9018613f058b59c9b.tar.gz gsoc2013-epiphany-754c3261279b58118b16cfe9018613f058b59c9b.tar.bz2 gsoc2013-epiphany-754c3261279b58118b16cfe9018613f058b59c9b.tar.lz gsoc2013-epiphany-754c3261279b58118b16cfe9018613f058b59c9b.tar.xz gsoc2013-epiphany-754c3261279b58118b16cfe9018613f058b59c9b.tar.zst gsoc2013-epiphany-754c3261279b58118b16cfe9018613f058b59c9b.zip | |
Simplified and reorganised zoom. Implement a zoom control for the toolbar.
2003-05-19 Christian Persch <chpe+gnomebugz@stud.uni-saarland.de>
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.
Diffstat (limited to 'src/window-commands.c')
| -rw-r--r-- | src/window-commands.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/window-commands.c b/src/window-commands.c index fbc141ca0..652b8c23e 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -36,6 +36,7 @@ #include "toolbar.h" #include "ephy-state.h" #include "ephy-gui.h" +#include "ephy-zoom.h" #include <string.h> #include <libgnomevfs/gnome-vfs-uri.h> @@ -565,38 +566,21 @@ void window_cmd_view_zoom_in (EggAction *action, EphyWindow *window) { - EphyEmbed *embed; - int zoom; - - embed = ephy_window_get_active_embed (window); - g_return_if_fail (embed != NULL); - - ephy_embed_zoom_get (embed, &zoom); - ephy_window_set_zoom (window, zoom + 10); + ephy_window_set_zoom (window, ZOOM_IN); } void window_cmd_view_zoom_out (EggAction *action, EphyWindow *window) { - EphyEmbed *embed; - int zoom; - - embed = ephy_window_get_active_embed (window); - g_return_if_fail (embed != NULL); - - ephy_embed_zoom_get (embed, &zoom); - if (zoom >= 10) - { - ephy_window_set_zoom (window, zoom - 10); - } + ephy_window_set_zoom (window, ZOOM_OUT); } void window_cmd_view_zoom_normal (EggAction *action, EphyWindow *window) { - ephy_window_set_zoom (window, 100); + ephy_window_set_zoom (window, 1.0); } void |