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

Merge branch '1.0'

Browse Source
This commit is contained in:
David Capello 2014-11-29 15:07:16 -03:00
commit 2d57ca4b3e
6 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@ -61,23 +61,23 @@ mark_as_advanced(
CMAKE_EXE_LINKER_FLAGS_PROFILE
)
if(COMPILER_GCC)
if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS_PROFILE "-pg"
CACHE STRING "profiling flags")
CACHE STRING "Profiling C flags")
set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE}"
CACHE STRING "profiling flags")
CACHE STRING "Profiling C++ flags")
set(CMAKE_EXE_LINKER_FLAGS_PROFILE "-pg"
CACHE STRING "profiling flags")
endif(COMPILER_GCC)
CACHE STRING "Profiling linker flags")
endif()
if(COMPILER_MSVC)
set(CMAKE_C_FLAGS_PROFILE "-Gd -Ox"
CACHE STRING "profiling flags")
if(MSVC)
set(CMAKE_C_FLAGS_PROFILE "/MD /Zi /Ox /Gd /D NDEBUG"
CACHE STRING "Profiling C flags")
set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE}"
CACHE STRING "profiling flags")
set(CMAKE_EXE_LINKER_FLAGS_PROFILE "-profile"
CACHE STRING "profiling flags")
endif(COMPILER_MSVC)
CACHE STRING "Profiling C++ flags")
set(CMAKE_EXE_LINKER_FLAGS_PROFILE "/PROFILE /DEBUG"
CACHE STRING "Profiling linker flags")
endif()
######################################################################
# Directories

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

@ -82,7 +82,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())
@ -165,7 +165,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());

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

@ -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;

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

@ -308,6 +308,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))
@ -324,6 +325,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);
@ -376,6 +378,11 @@ bool UISettingsImpl::getZoomWithScrollWheel()
return m_zoomWithScrollWheel;
}
bool UISettingsImpl::getCenterOnZoom()
{
return m_centerOnZoom;
}
bool UISettingsImpl::getShowSpriteEditorScrollbars()
{
return m_showSpriteEditorScrollbars;
@ -424,6 +431,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;

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

@ -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;

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

@ -1356,7 +1356,7 @@ void Editor::setZoomAndCenterInMouse(Zoom zoom,
switch (zoomBehavior) {
case kCofiguredZoomBehavior:
centerMouse = get_config_bool("Editor", "CenterOnZoom", false);
centerMouse = UIContext::instance()->settings()->getCenterOnZoom();
break;
case kCenterOnZoom:
centerMouse = true;