[aseprite] 78/134: Convert CenterOnZoom into a ISettings property

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 694b9c5cd8f58ede39921fbffe70426ab318a067
Author: David Capello <davidcapello at gmail.com>
Date:   Fri Nov 28 23:04:01 2014 -0300

    Convert CenterOnZoom into a ISettings property
---
 src/app/commands/cmd_options.cpp      |  4 ++--
 src/app/settings/settings.h           |  2 ++
 src/app/settings/ui_settings_impl.cpp | 12 ++++++++++++
 src/app/settings/ui_settings_impl.h   |  3 +++
 src/app/ui/editor/editor.cpp          |  2 +-
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp
index 2231beb..48b87c5 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -78,7 +78,7 @@ public:
         ui::MenuBar::expandOnMouseover()))
       expandMenubarOnMouseover()->setSelected(true);
 
-    if (get_config_bool("Editor", "CenterOnZoom", false))
+    if (m_settings->getCenterOnZoom())
       centerOnZoom()->setSelected(true);
 
     if (m_settings->experimental()->useNativeCursor())
@@ -157,7 +157,7 @@ public:
     set_config_bool("Options", "ExpandMenuBarOnMouseover", expandOnMouseover);
     ui::MenuBar::setExpandOnMouseover(expandOnMouseover);
 
-    set_config_bool("Editor", "CenterOnZoom", centerOnZoom()->isSelected());
+    m_settings->setCenterOnZoom(centerOnZoom()->isSelected());
 
     m_settings->setShowSpriteEditorScrollbars(showScrollbars()->isSelected());
     m_settings->setZoomWithScrollWheel(wheelZoom()->isSelected());
diff --git a/src/app/settings/settings.h b/src/app/settings/settings.h
index 944b431..434b137 100644
--- a/src/app/settings/settings.h
+++ b/src/app/settings/settings.h
@@ -65,6 +65,7 @@ namespace app {
 
     // General settings
     virtual bool getZoomWithScrollWheel() = 0;
+    virtual bool getCenterOnZoom() = 0;
     virtual bool getShowSpriteEditorScrollbars() = 0;
     virtual RightClickMode getRightClickMode() = 0;
     virtual bool getGrabAlpha() = 0;
@@ -75,6 +76,7 @@ namespace app {
     virtual app::ColorSwatches* getColorSwatches() = 0;
 
     virtual void setZoomWithScrollWheel(bool state) = 0;
+    virtual void setCenterOnZoom(bool state) = 0;
     virtual void setShowSpriteEditorScrollbars(bool state) = 0;
     virtual void setRightClickMode(RightClickMode mode) = 0;
     virtual void setGrabAlpha(bool state) = 0;
diff --git a/src/app/settings/ui_settings_impl.cpp b/src/app/settings/ui_settings_impl.cpp
index d01ae81..066298b 100644
--- a/src/app/settings/ui_settings_impl.cpp
+++ b/src/app/settings/ui_settings_impl.cpp
@@ -285,6 +285,7 @@ UISettingsImpl::UISettingsImpl()
   , m_colorSwatches(NULL)
   , m_selectionSettings(new UISelectionSettingsImpl)
   , m_zoomWithScrollWheel(get_config_bool("Options", "ZoomWithMouseWheel", true))
+  , m_centerOnZoom(get_config_bool("Editor", "CenterOnZoom", false))
   , m_showSpriteEditorScrollbars(get_config_bool("Options", "ShowScrollbars", true))
   , m_grabAlpha(get_config_bool("Options", "GrabAlpha", false))
   , m_autoSelectLayer(get_config_bool("Options", "AutoSelectLayer", false))
@@ -301,6 +302,7 @@ UISettingsImpl::UISettingsImpl()
 UISettingsImpl::~UISettingsImpl()
 {
   set_config_bool("Options", "ZoomWithMouseWheel", m_zoomWithScrollWheel);
+  set_config_bool("Editor", "CenterOnZoom", m_centerOnZoom);
   set_config_bool("Options", "ShowScrollbars", m_showSpriteEditorScrollbars);
   set_config_bool("Options", "GrabAlpha", m_grabAlpha);
   set_config_bool("Options", "AutoSelectLayer", m_autoSelectLayer);
@@ -353,6 +355,11 @@ bool UISettingsImpl::getZoomWithScrollWheel()
   return m_zoomWithScrollWheel;
 }
 
+bool UISettingsImpl::getCenterOnZoom()
+{
+  return m_centerOnZoom;
+}
+
 bool UISettingsImpl::getShowSpriteEditorScrollbars()
 {
   return m_showSpriteEditorScrollbars;
@@ -401,6 +408,11 @@ void UISettingsImpl::setZoomWithScrollWheel(bool state)
   m_zoomWithScrollWheel = state;
 }
 
+void UISettingsImpl::setCenterOnZoom(bool state)
+{
+  m_centerOnZoom = state;
+}
+
 void UISettingsImpl::setShowSpriteEditorScrollbars(bool state)
 {
   m_showSpriteEditorScrollbars = state;
diff --git a/src/app/settings/ui_settings_impl.h b/src/app/settings/ui_settings_impl.h
index a4b6c5b..b6f749a 100644
--- a/src/app/settings/ui_settings_impl.h
+++ b/src/app/settings/ui_settings_impl.h
@@ -54,6 +54,7 @@ namespace app {
 
     // ISettings implementation
     bool getZoomWithScrollWheel() override;
+    bool getCenterOnZoom() override;
     bool getShowSpriteEditorScrollbars() override;
     RightClickMode getRightClickMode() override;
     bool getGrabAlpha() override;
@@ -64,6 +65,7 @@ namespace app {
     app::ColorSwatches* getColorSwatches() override;
 
     void setZoomWithScrollWheel(bool state) override;
+    void setCenterOnZoom(bool state) override;
     void setShowSpriteEditorScrollbars(bool state) override;
     void setRightClickMode(RightClickMode mode) override;
     void setGrabAlpha(bool state) override;
@@ -103,6 +105,7 @@ namespace app {
     std::vector<app::ColorSwatches*> m_colorSwatchesStore;
     base::UniquePtr<ISelectionSettings> m_selectionSettings;
     bool m_zoomWithScrollWheel;
+    bool m_centerOnZoom;
     bool m_showSpriteEditorScrollbars;
     bool m_grabAlpha;
     bool m_autoSelectLayer;
diff --git a/src/app/ui/editor/editor.cpp b/src/app/ui/editor/editor.cpp
index 7654856..b81ae28 100644
--- a/src/app/ui/editor/editor.cpp
+++ b/src/app/ui/editor/editor.cpp
@@ -1344,7 +1344,7 @@ void Editor::setZoomAndCenterInMouse(int zoom, int mouse_x, int mouse_y, ZoomBeh
 
   switch (zoomBehavior) {
     case kCofiguredZoomBehavior:
-      centerMouse = get_config_bool("Editor", "CenterOnZoom", false);
+      centerMouse = UIContext::instance()->settings()->getCenterOnZoom();
       break;
     case kCenterOnZoom:
       centerMouse = true;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git