diff options
| author | Craig Marshall <craig9@gmail.com> | 2013-03-26 08:35:00 +0000 |
|---|---|---|
| committer | Craig Marshall <craig9@gmail.com> | 2013-03-26 08:35:00 +0000 |
| commit | 708181e0ec7ef17e7e19cd11e539aa2f5188cd29 (patch) | |
| tree | c1b03f0a9c0ec61a55fe6e00d76fb16ae977b37a /src | |
| parent | Drop unnecessary (and broken with Gtk+ 3) check for Gtk+ backend (diff) | |
| download | inkscape-708181e0ec7ef17e7e19cd11e539aa2f5188cd29.tar.gz inkscape-708181e0ec7ef17e7e19cd11e539aa2f5188cd29.zip | |
Fixed broken logic in zoom history to fix bug 1106031 (and removed some unrelated and unnecessary debug output)
(bzr r12245)
Diffstat (limited to 'src')
| -rw-r--r-- | src/desktop.cpp | 2 | ||||
| -rw-r--r-- | src/tools-switch.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp index c04dba6cc..0bf442b7a 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -811,7 +811,7 @@ SPDesktop::push_current_zoom (std::list<Geom::Rect> &history) { Geom::Rect area = get_display_area(); - if (history.empty() || history.front() == area) { + if (history.empty() || history.front() != area) { history.push_front(area); } } diff --git a/src/tools-switch.cpp b/src/tools-switch.cpp index f0535e2ff..9e7dfa3f9 100644 --- a/src/tools-switch.cpp +++ b/src/tools-switch.cpp @@ -213,7 +213,6 @@ tools_switch(SPDesktop *dt, int num) dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> or <b>double click</b> to create a mesh on selected objects, <b>drag handles</b> to adjust meshes.")); break; case TOOLS_ZOOM: - std::cout << "tools-switch.cpp: TOOLS_ZOOM" << std::endl; dt->set_event_context(SP_TYPE_ZOOM_CONTEXT, tool_names[num]); dt->activate_guides(false); inkscape_eventcontext_set(sp_desktop_event_context(dt)); |