Restore crappy zoom code + ignore cursor zoom on keyboard zoom

Author: swagtoy

src/editor/editor.cpp

@@ -139,6 +139,7 @@ Editor::Editor() :
   m_ctrl_pressed(false),
   m_shift_pressed(false),
   m_alt_pressed(false),
+  m_key_zoomed(false),
   m_sector(),
   m_levelloaded(false),
   m_leveltested(false),
@@ -642,12 +643,13 @@ Editor::update(float dt_sec, const Controller& controller)
       camera.set_scale(m_new_scale);
 
       // When zooming in, focus on the position of the mouse.
-      // if (zooming_in)
-      //   camera.move((m_mouse_pos - Vector(static_cast<float>(SCREEN_WIDTH - 128),
-      //                                     static_cast<float>(SCREEN_HEIGHT - 32)) / 2.f) / CAMERA_ZOOM_FOCUS_PROGRESSION);
+      if (zooming_in && !m_key_zoomed)
+        camera.move((m_mouse_pos - Vector(static_cast<float>(SCREEN_WIDTH - 128),
+                                          static_cast<float>(SCREEN_HEIGHT - 32)) / 2.f) / CAMERA_ZOOM_FOCUS_PROGRESSION);
 
       keep_camera_in_bounds();
     }
+    m_key_zoomed = false;
     m_new_scale = 0.f;
   }
 
@@ -1365,10 +1367,12 @@ Editor::event(const SDL_Event& ev)
             case SDLK_PLUS: // Zoom in
             case SDLK_EQUALS:
             case SDLK_KP_PLUS:
+              m_key_zoomed = true;
               m_new_scale = m_sector->get_camera().get_current_scale() + CAMERA_ZOOM_SENSITIVITY;
               break;
             case SDLK_MINUS: // Zoom out
             case SDLK_KP_MINUS:
+              m_key_zoomed = true;
               m_new_scale = m_sector->get_camera().get_current_scale() - CAMERA_ZOOM_SENSITIVITY;
               break;
             case SDLK_d: // Reset zoom

src/editor/editor.hpp

@@ -97,7 +97,7 @@ class Editor final : public Screen,
   inline TileSet* get_tileset() const { return m_tileset; }
   inline TileSelection* get_tiles() const { return m_toolbox_widget->get_tilebox().get_tiles(); }
   inline std::string get_tileselect_object() const { return m_toolbox_widget->get_tilebox().get_object(); }
-  
+
   void toggle_tile_object_mode();
 
   inline EditorTilebox::InputType get_tileselect_input_type() const { return m_toolbox_widget->get_tilebox().get_input_type(); }
@@ -108,7 +108,7 @@ class Editor final : public Screen,
   inline int get_tileselect_move_mode() const { return m_toolbox_widget->get_tileselect_move_mode(); }
 
   inline const std::string& get_levelfile() const { return m_levelfile; }
-  
+
   void level_from_nothing();
 
   void set_level(std::unique_ptr<Level> level, bool reset = true);
@@ -119,7 +119,7 @@ class Editor final : public Screen,
   }
 
   std::string get_level_directory() const;
-  
+
   inline bool is_temp_level() const { return m_temp_level; }
 
   void open_level_directory();
@@ -149,7 +149,7 @@ class Editor final : public Screen,
   void esc_press();
   void delete_markers();
   void sort_layers();
-  
+
   inline void disable_testing() { m_testing_disabled = true; }
 
   void select_tilegroup(int id);
@@ -239,11 +239,12 @@ class Editor final : public Screen,
   bool m_ctrl_pressed;
   bool m_shift_pressed;
   bool m_alt_pressed;
-  
+  bool m_key_zoomed;
+
   ScriptManager m_script_manager;
-  
+
   exit_cb_t m_on_exit_cb;
-  
+
   bool m_tilebox_something_selected;
 
 private:
@@ -277,14 +278,14 @@ class Editor final : public Screen,
 
   float m_scroll_speed;
   float m_new_scale;
-  
+
   float m_widgets_width;
   float m_widgets_width_offset;
 
   Vector m_mouse_pos;
 
   bool m_layers_widget_needs_refresh;
-  
+
   SpritePtr m_shadow;
 
 private:

src/object/camera.cpp

@@ -290,7 +290,8 @@ Camera::scroll_to(const Vector& goal, float scrolltime)
   {
     m_translation.x = goal.x;
     m_translation.y = goal.y;
-    m_mode = Mode::MANUAL;
+    if (m_mode != Mode::FREE)
+      m_mode = Mode::MANUAL;
     return;
   }