From b856c71f9d05a15e123b2d2953f59a9e5e5625c5 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 10 Nov 2017 16:29:47 -0300
Subject: [PATCH] Fix filters preview for tiled mode

---
 .../commands/filters/filter_manager_impl.cpp  |  7 +++--
 src/app/ui/editor/editor.cpp                  | 30 +++++++++++++++++++
 src/app/ui/editor/editor.h                    |  2 ++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/app/commands/filters/filter_manager_impl.cpp b/src/app/commands/filters/filter_manager_impl.cpp
index 4000fad3b..fd9ec6f66 100644
--- a/src/app/commands/filters/filter_manager_impl.cpp
+++ b/src/app/commands/filters/filter_manager_impl.cpp
@@ -126,8 +126,9 @@ void FilterManagerImpl::beginForPreview()
   m_row = m_nextRowToFlush = 0;
   m_mask = m_previewMask;
 
-  {
-    Editor* editor = current_editor;
+  Editor* editor = current_editor;
+  // If we have a tiled mode enabled, we'll apply the filter to the whole areaes
+  if (editor->docPref().tiled.mode() == filters::TiledMode::NONE) {
     Sprite* sprite = m_site.sprite();
     gfx::Rect vp = View::getView(editor)->viewportBounds();
     vp = editor->screenToEditor(vp);
@@ -314,6 +315,8 @@ void FilterManagerImpl::flush()
                                               editor->projection().removeY(h+2))));
 
     gfx::Region reg1(rect);
+    editor->expandRegionByTiledMode(reg1, true);
+
     gfx::Region reg2;
     editor->getDrawableRegion(reg2, Widget::kCutTopWindows);
     reg1.createIntersection(reg1, reg2);
diff --git a/src/app/ui/editor/editor.cpp b/src/app/ui/editor/editor.cpp
index e31bca77f..468833256 100644
--- a/src/app/ui/editor/editor.cpp
+++ b/src/app/ui/editor/editor.cpp
@@ -2388,6 +2388,36 @@ gfx::Point Editor::mainTilePosition() const
   return pt;
 }
 
+void Editor::expandRegionByTiledMode(gfx::Region& rgn,
+                                     const bool withProj) const
+{
+  gfx::Region tile = rgn;
+  const bool xTiled = (int(m_docPref.tiled.mode()) & int(filters::TiledMode::X_AXIS));
+  const bool yTiled = (int(m_docPref.tiled.mode()) & int(filters::TiledMode::Y_AXIS));
+  int w = m_sprite->width();
+  int h = m_sprite->height();
+  if (withProj) {
+    w = m_proj.applyX(w);
+    h = m_proj.applyY(h);
+  }
+  if (xTiled) {
+    tile.offset(w, 0); rgn |= tile;
+    tile.offset(w, 0); rgn |= tile;
+    tile.offset(-2*w, 0);
+  }
+  if (yTiled) {
+    tile.offset(0, h); rgn |= tile;
+    tile.offset(0, h); rgn |= tile;
+    tile.offset(0, -2*h);
+  }
+  if (xTiled && yTiled) {
+    tile.offset(w, h); rgn |= tile;
+    tile.offset(w, 0); rgn |= tile;
+    tile.offset(-w, h); rgn |= tile;
+    tile.offset(w, 0); rgn |= tile;
+  }
+}
+
 bool Editor::isMovingPixels() const
 {
   return (dynamic_cast<MovingPixelsState*>(m_state.get()) != nullptr);
diff --git a/src/app/ui/editor/editor.h b/src/app/ui/editor/editor.h
index 30df99f54..e96bf9457 100644
--- a/src/app/ui/editor/editor.h
+++ b/src/app/ui/editor/editor.h
@@ -179,6 +179,8 @@ namespace app {
 
     gfx::Size canvasSize() const;
     gfx::Point mainTilePosition() const;
+    void expandRegionByTiledMode(gfx::Region& rgn,
+                                 const bool withProj) const;
 
     // Changes the scroll to see the given point as the center of the editor.
     void centerInSpritePoint(const gfx::Point& spritePos);