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

Tiled mode: Count extra tiles as the canvas size (so we can zoom in on it) (fix #1448)

Browse Source
This commit is contained in:
David Capello 2017-11-07 15:21:03 -03:00
parent ceb9cb3abd
commit 641ac68d70
2 changed files with 58 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,7 +207,7 @@ Editor::Editor(Document* document, EditorFlags flags)
setLayer(layers[layerIndex]); setLayer(layers[layerIndex]);
} }
m_tiledConn = m_docPref.tiled.AfterChange.connect(base::Bind<void>(&Editor::invalidate, this)); m_tiledConn = m_docPref.tiled.AfterChange.connect(base::Bind<void>(&Editor::onTiledModeChange, this));
m_gridConn = m_docPref.grid.AfterChange.connect(base::Bind<void>(&Editor::invalidate, this)); m_gridConn = m_docPref.grid.AfterChange.connect(base::Bind<void>(&Editor::invalidate, this));
m_pixelGridConn = m_docPref.pixelGrid.AfterChange.connect(base::Bind<void>(&Editor::invalidate, this)); m_pixelGridConn = m_docPref.pixelGrid.AfterChange.connect(base::Bind<void>(&Editor::invalidate, this));
m_bgConn = m_docPref.bg.AfterChange.connect(base::Bind<void>(&Editor::invalidate, this)); m_bgConn = m_docPref.bg.AfterChange.connect(base::Bind<void>(&Editor::invalidate, this));
@ -414,31 +414,33 @@ void Editor::setDefaultScroll()
{ {
View* view = View::getView(this); View* view = View::getView(this);
Rect vp = view->viewportBounds(); Rect vp = view->viewportBounds();
gfx::Size canvas = canvasSize();
setEditorScroll( setEditorScroll(
gfx::Point( gfx::Point(
m_padding.x - vp.w/2 + m_proj.applyX(m_sprite->width())/2, m_padding.x - vp.w/2 + m_proj.applyX(canvas.w)/2,
m_padding.y - vp.h/2 + m_proj.applyY(m_sprite->height())/2)); m_padding.y - vp.h/2 + m_proj.applyY(canvas.h)/2));
} }
void Editor::setScrollAndZoomToFitScreen() void Editor::setScrollAndZoomToFitScreen()
{ {
View* view = View::getView(this); View* view = View::getView(this);
Rect vp = view->viewportBounds(); gfx::Rect vp = view->viewportBounds();
gfx::Size canvas = canvasSize();
Zoom zoom = m_proj.zoom(); Zoom zoom = m_proj.zoom();
if (float(vp.w) / float(m_sprite->width()) < if (float(vp.w) / float(canvas.w) <
float(vp.h) / float(m_sprite->height())) { float(vp.h) / float(canvas.h)) {
if (vp.w < m_proj.applyX(m_sprite->width())) { if (vp.w < m_proj.applyX(canvas.w)) {
while (vp.w < m_proj.applyX(m_sprite->width())) { while (vp.w < m_proj.applyX(canvas.w)) {
if (!zoom.out()) if (!zoom.out())
break; break;
m_proj.setZoom(zoom); m_proj.setZoom(zoom);
} }
} }
else if (vp.w > m_proj.applyX(m_sprite->width())) { else if (vp.w > m_proj.applyX(canvas.w)) {
bool out = true; bool out = true;
while (vp.w > m_proj.applyX(m_sprite->width())) { while (vp.w > m_proj.applyX(canvas.w)) {
if (!zoom.in()) { if (!zoom.in()) {
out = false; out = false;
break; break;
@ -452,16 +454,16 @@ void Editor::setScrollAndZoomToFitScreen()
} }
} }
else { else {
if (vp.h < m_proj.applyY(m_sprite->height())) { if (vp.h < m_proj.applyY(canvas.h)) {
while (vp.h < m_proj.applyY(m_sprite->height())) { while (vp.h < m_proj.applyY(canvas.h)) {
if (!zoom.out()) if (!zoom.out())
break; break;
m_proj.setZoom(zoom); m_proj.setZoom(zoom);
} }
} }
else if (vp.h > m_proj.applyY(m_sprite->height())) { else if (vp.h > m_proj.applyY(canvas.h)) {
bool out = true; bool out = true;
while (vp.h > m_proj.applyY(m_sprite->height())) { while (vp.h > m_proj.applyY(canvas.h)) {
if (!zoom.in()) { if (!zoom.in()) {
out = false; out = false;
break; break;
@ -478,8 +480,8 @@ void Editor::setScrollAndZoomToFitScreen()
updateEditor(); updateEditor();
setEditorScroll( setEditorScroll(
gfx::Point( gfx::Point(
m_padding.x - vp.w/2 + m_proj.applyX(m_sprite->width())/2, m_padding.x - vp.w/2 + m_proj.applyX(canvas.w)/2,
m_padding.y - vp.h/2 + m_proj.applyY(m_sprite->height())/2)); m_padding.y - vp.h/2 + m_proj.applyY(canvas.h)/2));
} }
// Sets the scroll position of the editor // Sets the scroll position of the editor
@ -675,30 +677,30 @@ void Editor::drawSpriteUnclippedRect(ui::Graphics* g, const gfx::Rect& _rc)
// Document preferences // Document preferences
if (int(m_docPref.tiled.mode()) & int(filters::TiledMode::X_AXIS)) { if (int(m_docPref.tiled.mode()) & int(filters::TiledMode::X_AXIS)) {
drawOneSpriteUnclippedRect(g, rc, -spriteRect.w, 0); drawOneSpriteUnclippedRect(g, rc, spriteRect.w, 0);
drawOneSpriteUnclippedRect(g, rc, +spriteRect.w, 0); drawOneSpriteUnclippedRect(g, rc, spriteRect.w*2, 0);
enclosingRect = gfx::Rect(spriteRect.x-spriteRect.w, spriteRect.y, spriteRect.w*3, spriteRect.h); enclosingRect = gfx::Rect(spriteRect.x, spriteRect.y, spriteRect.w*3, spriteRect.h);
outside.createSubtraction(outside, gfx::Region(enclosingRect)); outside.createSubtraction(outside, gfx::Region(enclosingRect));
} }
if (int(m_docPref.tiled.mode()) & int(filters::TiledMode::Y_AXIS)) { if (int(m_docPref.tiled.mode()) & int(filters::TiledMode::Y_AXIS)) {
drawOneSpriteUnclippedRect(g, rc, 0, -spriteRect.h); drawOneSpriteUnclippedRect(g, rc, 0, spriteRect.h);
drawOneSpriteUnclippedRect(g, rc, 0, +spriteRect.h); drawOneSpriteUnclippedRect(g, rc, 0, spriteRect.h*2);
enclosingRect = gfx::Rect(spriteRect.x, spriteRect.y-spriteRect.h, spriteRect.w, spriteRect.h*3); enclosingRect = gfx::Rect(spriteRect.x, spriteRect.y, spriteRect.w, spriteRect.h*3);
outside.createSubtraction(outside, gfx::Region(enclosingRect)); outside.createSubtraction(outside, gfx::Region(enclosingRect));
} }
if (m_docPref.tiled.mode() == filters::TiledMode::BOTH) { if (m_docPref.tiled.mode() == filters::TiledMode::BOTH) {
drawOneSpriteUnclippedRect(g, rc, -spriteRect.w, -spriteRect.h); drawOneSpriteUnclippedRect(g, rc, spriteRect.w, spriteRect.h);
drawOneSpriteUnclippedRect(g, rc, +spriteRect.w, -spriteRect.h); drawOneSpriteUnclippedRect(g, rc, spriteRect.w*2, spriteRect.h);
drawOneSpriteUnclippedRect(g, rc, -spriteRect.w, +spriteRect.h); drawOneSpriteUnclippedRect(g, rc, spriteRect.w, spriteRect.h*2);
drawOneSpriteUnclippedRect(g, rc, +spriteRect.w, +spriteRect.h); drawOneSpriteUnclippedRect(g, rc, spriteRect.w*2, spriteRect.h*2);
enclosingRect = gfx::Rect( enclosingRect = gfx::Rect(
spriteRect.x-spriteRect.w, spriteRect.x, spriteRect.y,
spriteRect.y-spriteRect.h, spriteRect.w*3, spriteRect.h*3); spriteRect.w*3, spriteRect.h*3);
outside.createSubtraction(outside, gfx::Region(enclosingRect)); outside.createSubtraction(outside, gfx::Region(enclosingRect));
} }
@ -1731,11 +1733,11 @@ bool Editor::onProcessMessage(Message* msg)
void Editor::onSizeHint(SizeHintEvent& ev) void Editor::onSizeHint(SizeHintEvent& ev)
{ {
gfx::Size sz(0, 0); gfx::Size sz(0, 0);
if (m_sprite) { if (m_sprite) {
gfx::Point padding = calcExtraPadding(m_proj); gfx::Point padding = calcExtraPadding(m_proj);
sz.w = m_proj.applyX(m_sprite->width()) + padding.x*2; gfx::Size canvas = canvasSize();
sz.h = m_proj.applyY(m_sprite->height()) + padding.y*2; sz.w = m_proj.applyX(canvas.w) + padding.x*2;
sz.h = m_proj.applyY(canvas.h) + padding.y*2;
} }
else { else {
sz.w = 4; sz.w = 4;
@ -1827,6 +1829,13 @@ void Editor::onContextBarBrushChange()
m_brushPreview.redraw(); m_brushPreview.redraw();
} }
void Editor::onTiledModeChange()
{
m_padding = calcExtraPadding(m_proj);
updateEditor();
invalidate();
}
void Editor::onShowExtrasChange() void Editor::onShowExtrasChange()
{ {
invalidate(); invalidate();
@ -2316,20 +2325,33 @@ ImageBufferPtr Editor::getRenderImageBuffer()
return m_renderBuffer; return m_renderBuffer;
} }
// static
gfx::Point Editor::calcExtraPadding(const Projection& proj) gfx::Point Editor::calcExtraPadding(const Projection& proj)
{ {
View* view = View::getView(this); View* view = View::getView(this);
if (view) { if (view) {
Rect vp = view->viewportBounds(); Rect vp = view->viewportBounds();
gfx::Size canvas = canvasSize();
return gfx::Point( return gfx::Point(
std::max<int>(vp.w/2, vp.w - proj.applyX(m_sprite->width())), std::max<int>(vp.w/2, vp.w - proj.applyX(canvas.w)),
std::max<int>(vp.h/2, vp.h - proj.applyY(m_sprite->height()))); std::max<int>(vp.h/2, vp.h - proj.applyY(canvas.h)));
} }
else else
return gfx::Point(0, 0); return gfx::Point(0, 0);
} }
gfx::Size Editor::canvasSize() const
{
gfx::Size sz(m_sprite->width(),
m_sprite->height());
if (int(m_docPref.tiled.mode()) & int(filters::TiledMode::X_AXIS)) {
sz.w += sz.w*2;
}
if (int(m_docPref.tiled.mode()) & int(filters::TiledMode::Y_AXIS)) {
sz.h += sz.h*2;
}
return sz;
}
bool Editor::isMovingPixels() const bool Editor::isMovingPixels() const
{ {
return (dynamic_cast<MovingPixelsState*>(m_state.get()) != nullptr); return (dynamic_cast<MovingPixelsState*>(m_state.get()) != nullptr);

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

@ -274,6 +274,7 @@ namespace app {
void onInvalidateRegion(const gfx::Region& region) override; void onInvalidateRegion(const gfx::Region& region) override;
void onFgColorChange(); void onFgColorChange();
void onContextBarBrushChange(); void onContextBarBrushChange();
void onTiledModeChange();
void onShowExtrasChange(); void onShowExtrasChange();
// DocumentObserver impl // DocumentObserver impl
@ -320,6 +321,7 @@ namespace app {
void drawOneSpriteUnclippedRect(ui::Graphics* g, const gfx::Rect& rc, int dx, int dy); void drawOneSpriteUnclippedRect(ui::Graphics* g, const gfx::Rect& rc, int dx, int dy);
gfx::Point calcExtraPadding(const render::Projection& proj); gfx::Point calcExtraPadding(const render::Projection& proj);
gfx::Size canvasSize() const;
void invalidateIfActive(); void invalidateIfActive();
bool showAutoCelGuides(); bool showAutoCelGuides();