mirror of
https://github.com/aseprite/aseprite.git
synced 2024-10-05 06:20:10 +00:00
Implemented onionskin stuff in UISettingsImpl class.
This commit is contained in:
parent
fef94477cb
commit
313b915e63
@ -38,19 +38,21 @@ UISettingsImpl::UISettingsImpl()
|
|||||||
m_currentTool = NULL;
|
m_currentTool = NULL;
|
||||||
m_tiledMode = (TiledMode)get_config_int("Tools", "Tiled", (int)TILED_NONE);
|
m_tiledMode = (TiledMode)get_config_int("Tools", "Tiled", (int)TILED_NONE);
|
||||||
m_tiledMode = (TiledMode)MID(0, (int)m_tiledMode, (int)TILED_BOTH);
|
m_tiledMode = (TiledMode)MID(0, (int)m_tiledMode, (int)TILED_BOTH);
|
||||||
m_use_onionskin = get_config_bool("Tools", "Onionskin", false);
|
|
||||||
m_snapToGrid = get_config_bool("Grid", "SnapTo", false);
|
m_snapToGrid = get_config_bool("Grid", "SnapTo", false);
|
||||||
m_gridVisible = get_config_bool("Grid", "Visible", false);
|
m_gridVisible = get_config_bool("Grid", "Visible", false);
|
||||||
m_gridColor = get_config_color("Grid", "Color", color_rgb(0, 0, 255));
|
m_gridColor = get_config_color("Grid", "Color", color_rgb(0, 0, 255));
|
||||||
m_gridBounds = get_config_rect("Grid", "Bounds", m_gridBounds);
|
m_gridBounds = get_config_rect("Grid", "Bounds", m_gridBounds);
|
||||||
m_pixelGridVisible = get_config_bool("PixelGrid", "Visible", false);
|
m_pixelGridVisible = get_config_bool("PixelGrid", "Visible", false);
|
||||||
m_pixelGridColor = get_config_color("PixelGrid", "Color", color_rgb(200, 200, 200));
|
m_pixelGridColor = get_config_color("PixelGrid", "Color", color_rgb(200, 200, 200));
|
||||||
|
|
||||||
|
m_use_onionskin = get_config_bool("Onionskin", "Enabled", false);
|
||||||
|
m_prev_frames_onionskin = get_config_int("Onionskin", "PrevFrames", 1);
|
||||||
|
m_next_frames_onionskin = get_config_int("Onionskin", "NextFrames", 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
UISettingsImpl::~UISettingsImpl()
|
UISettingsImpl::~UISettingsImpl()
|
||||||
{
|
{
|
||||||
set_config_int("Tools", "Tiled", m_tiledMode);
|
set_config_int("Tools", "Tiled", m_tiledMode);
|
||||||
set_config_bool("Tools", "Onionskin", m_use_onionskin);
|
|
||||||
set_config_bool("Grid", "SnapTo", m_snapToGrid);
|
set_config_bool("Grid", "SnapTo", m_snapToGrid);
|
||||||
set_config_bool("Grid", "Visible", m_gridVisible);
|
set_config_bool("Grid", "Visible", m_gridVisible);
|
||||||
set_config_rect("Grid", "Bounds", m_gridBounds);
|
set_config_rect("Grid", "Bounds", m_gridBounds);
|
||||||
@ -58,6 +60,10 @@ UISettingsImpl::~UISettingsImpl()
|
|||||||
set_config_bool("PixelGrid", "Visible", m_pixelGridVisible);
|
set_config_bool("PixelGrid", "Visible", m_pixelGridVisible);
|
||||||
set_config_color("PixelGrid", "Color", m_pixelGridColor);
|
set_config_color("PixelGrid", "Color", m_pixelGridColor);
|
||||||
|
|
||||||
|
set_config_bool("Onionskin", "Enabled", m_use_onionskin);
|
||||||
|
set_config_int("Onionskin", "PrevFrames", m_prev_frames_onionskin);
|
||||||
|
set_config_int("Onionskin", "NextFrames", m_next_frames_onionskin);
|
||||||
|
|
||||||
// delete all tool settings
|
// delete all tool settings
|
||||||
std::map<std::string, IToolSettings*>::iterator it;
|
std::map<std::string, IToolSettings*>::iterator it;
|
||||||
for (it = m_toolSettings.begin(); it != m_toolSettings.end(); ++it)
|
for (it = m_toolSettings.begin(); it != m_toolSettings.end(); ++it)
|
||||||
@ -195,24 +201,27 @@ bool UISettingsImpl::getUseOnionskin()
|
|||||||
|
|
||||||
int UISettingsImpl::getOnionskinPrevFrames()
|
int UISettingsImpl::getOnionskinPrevFrames()
|
||||||
{
|
{
|
||||||
return 1;
|
return m_prev_frames_onionskin;
|
||||||
}
|
}
|
||||||
|
|
||||||
int UISettingsImpl::getOnionskinNextFrames()
|
int UISettingsImpl::getOnionskinNextFrames()
|
||||||
{
|
{
|
||||||
return 0;
|
return m_next_frames_onionskin;
|
||||||
}
|
}
|
||||||
|
|
||||||
void UISettingsImpl::setUseOnionskin(bool state)
|
void UISettingsImpl::setUseOnionskin(bool state)
|
||||||
{
|
{
|
||||||
|
m_use_onionskin = state;
|
||||||
}
|
}
|
||||||
|
|
||||||
void UISettingsImpl::setOnionskinPrevFrames(int frames)
|
void UISettingsImpl::setOnionskinPrevFrames(int frames)
|
||||||
{
|
{
|
||||||
|
m_prev_frames_onionskin = frames;
|
||||||
}
|
}
|
||||||
|
|
||||||
void UISettingsImpl::setOnionskinNextFrames(int frames)
|
void UISettingsImpl::setOnionskinNextFrames(int frames)
|
||||||
{
|
{
|
||||||
|
m_next_frames_onionskin = frames;
|
||||||
}
|
}
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
|
@ -79,6 +79,8 @@ private:
|
|||||||
TiledMode m_tiledMode;
|
TiledMode m_tiledMode;
|
||||||
Tool* m_currentTool;
|
Tool* m_currentTool;
|
||||||
bool m_use_onionskin;
|
bool m_use_onionskin;
|
||||||
|
int m_prev_frames_onionskin;
|
||||||
|
int m_next_frames_onionskin;
|
||||||
bool m_snapToGrid;
|
bool m_snapToGrid;
|
||||||
bool m_gridVisible;
|
bool m_gridVisible;
|
||||||
Rect m_gridBounds;
|
Rect m_gridBounds;
|
||||||
|
Loading…
Reference in New Issue
Block a user