mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-29 19:20:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace ISettings::get/setZoomWithScrollWheel() with Preferences class

Browse Source
This commit is contained in:
David Capello 2015-05-13 10:33:05 -03:00
parent 02d163b8d8
commit aea07d06af
5 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/commands/cmd_options.cpp
View File

@ -120,7 +120,7 @@ public:
rightClickBehavior()->setSelectedItemIndex((int)m_settings->getRightClickMode());
// Zoom with Scroll Wheel
wheelZoom()->setSelected(m_settings->getZoomWithScrollWheel());
wheelZoom()->setSelected(m_preferences.editor.zoomWithWheel());
// Checked background size
checkedBgSize()->addItem("16x16");
@ -178,7 +178,7 @@ public:
m_preferences.editor.zoomFromCenterWithWheel(zoomFromCenterWithWheel()->isSelected());
m_preferences.editor.zoomFromCenterWithKeys(zoomFromCenterWithKeys()->isSelected());
m_settings->setShowSpriteEditorScrollbars(showScrollbars()->isSelected());
m_settings->setZoomWithScrollWheel(wheelZoom()->isSelected());
m_preferences.editor.zoomWithWheel(wheelZoom()->isSelected());
m_settings->setRightClickMode(static_cast<RightClickMode>(rightClickBehavior()->getSelectedItemIndex()));
m_curPref->grid.color(m_gridColor->getColor());

2
src/app/settings/settings.h
View File

@ -44,7 +44,6 @@ namespace app {
virtual ~ISettings() { }
// General settings
virtual bool getZoomWithScrollWheel() = 0;
virtual bool getCenterOnZoom() = 0;
virtual bool getShowSpriteEditorScrollbars() = 0;
virtual RightClickMode getRightClickMode() = 0;
@ -55,7 +54,6 @@ namespace app {
virtual tools::Tool* getCurrentTool() = 0;
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;

12
src/app/settings/ui_settings_impl.cpp
View File

@ -78,7 +78,6 @@ UISettingsImpl::UISettingsImpl()
: m_currentTool(NULL)
, 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))
@ -95,7 +94,6 @@ 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);
@ -112,11 +110,6 @@ UISettingsImpl::~UISettingsImpl()
//////////////////////////////////////////////////////////////////////
// General settings
bool UISettingsImpl::getZoomWithScrollWheel()
{
return m_zoomWithScrollWheel;
}
bool UISettingsImpl::getCenterOnZoom()
{
return m_centerOnZoom;
@ -167,11 +160,6 @@ app::ColorSwatches* UISettingsImpl::getColorSwatches()
return m_colorSwatches;
}
void UISettingsImpl::setZoomWithScrollWheel(bool state)
{
m_zoomWithScrollWheel = state;
}
void UISettingsImpl::setCenterOnZoom(bool state)
{
m_centerOnZoom = state;

3
src/app/settings/ui_settings_impl.h
View File

@ -30,7 +30,6 @@ namespace app {
~UISettingsImpl();
// ISettings implementation
bool getZoomWithScrollWheel() override;
bool getCenterOnZoom() override;
bool getShowSpriteEditorScrollbars() override;
RightClickMode getRightClickMode() override;
@ -41,7 +40,6 @@ namespace app {
tools::Tool* getCurrentTool() override;
app::ColorSwatches* getColorSwatches() override;
void setZoomWithScrollWheel(bool state) override;
void setCenterOnZoom(bool state) override;
void setShowSpriteEditorScrollbars(bool state) override;
void setRightClickMode(RightClickMode mode) override;
@ -71,7 +69,6 @@ namespace app {
app::ColorSwatches* m_colorSwatches;
std::vector<app::ColorSwatches*> m_colorSwatchesStore;
base::UniquePtr<ISelectionSettings> m_selectionSettings;
bool m_zoomWithScrollWheel;
bool m_centerOnZoom;
bool m_showSpriteEditorScrollbars;
bool m_grabAlpha;

2
src/app/ui/editor/state_with_wheel_behavior.cpp
View File

@ -46,7 +46,7 @@ bool StateWithWheelBehavior::onMouseWheel(Editor* editor, MouseMessage* msg)
wheelAction = WHEEL_FG;
}
// Normal behavior: mouse wheel zooms
else if (UIContext::instance()->settings()->getZoomWithScrollWheel()) {
else if (App::instance()->preferences().editor.zoomWithWheel()) {
if (msg->ctrlPressed())
wheelAction = WHEEL_FRAME;
else if (msg->wheelDelta().x != 0 || msg->shiftPressed())