2 files changed, 9 insertions, 2 deletions
diff --git a/include/cru/platform/graphics/Painter.hpp b/include/cru/platform/graphics/Painter.hpp
index 24592f95..9bde0640 100644
--- a/include/cru/platform/graphics/Painter.hpp
+++ b/include/cru/platform/graphics/Painter.hpp
@@ -7,6 +7,8 @@ struct IPainter : virtual IPlatformResource {
   virtual Matrix GetTransform() = 0;
   virtual void SetTransform(const Matrix& matrix) = 0;
 
+  virtual void ConcatTransform(const Matrix& matrix) = 0;
+
   virtual void Clear(const Color& color) = 0;
 
   virtual void DrawLine(const Point& start, const Point& end, IBrush* brush,
@@ -26,6 +28,10 @@ struct IPainter : virtual IPlatformResource {
 
   virtual void PopLayer() = 0;
 
+  virtual void PushState() = 0;
+
+  virtual void PopState() = 0;
+
   virtual void EndDraw() = 0;
 };
 }  // namespace cru::platform::graphics
diff --git a/include/cru/platform/graphics/util/Painter.hpp b/include/cru/platform/graphics/util/Painter.hpp
index 90457cf4..2e0fbb51 100644
--- a/include/cru/platform/graphics/util/Painter.hpp
+++ b/include/cru/platform/graphics/util/Painter.hpp
@@ -10,8 +10,9 @@ void WithTransform(IPainter* painter, const Matrix& matrix, const Fn& action) {
   static_assert(std::is_invocable_v<decltype(action), IPainter*>,
                 "Action must can be be invoked with painter.");
   const auto old = painter->GetTransform();
-  painter->SetTransform(matrix * old);
+  painter->PushState();
+  painter->ConcatTransform(matrix);
   action(painter);
-  painter->SetTransform(old);
+  painter->PopState();
 }
 }  // namespace cru::platform::graphics::util