<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://git.reviewboard.kde.org/r/110244/">http://git.reviewboard.kde.org/r/110244/</a>
</td>
</tr>
</table>
<br />
<p>Ship it!</p>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Okay -- looks good! You'll need this patch, too, though, before pushing the commit to master, because the new canvas decoration Dmitry created didn't use the update api yet:
diff --git a/krita/ui/canvas/kis_infinity_manager.cpp b/krita/ui/canvas/kis_infinity_manager.cpp
index 513b1b4..f2d3884 100644
--- a/krita/ui/canvas/kis_infinity_manager.cpp
+++ b/krita/ui/canvas/kis_infinity_manager.cpp
@@ -116,10 +116,11 @@ void KisInfinityManager::imagePositionChanged()
}
}
-void KisInfinityManager::drawDecoration(QPainter& gc, const QRectF& updateArea, const KisCoordinatesConverter *converter)
+void KisInfinityManager::drawDecoration(QPainter& gc, const QRectF& updateArea, const KisCoordinatesConverter *converter, KisCanvas2 *canvas)
{
Q_UNUSED(updateArea);
Q_UNUSED(converter);
+ Q_UNUSED(canvas);
gc.save();
gc.setTransform(QTransform(), false);
diff --git a/krita/ui/canvas/kis_infinity_manager.h b/krita/ui/canvas/kis_infinity_manager.h
index eecc54b..591ce0f 100644
--- a/krita/ui/canvas/kis_infinity_manager.h
+++ b/krita/ui/canvas/kis_infinity_manager.h
@@ -23,7 +23,6 @@
#include <QPainterPath>
#include <QCursor>
-class KisCanvas2;
static const QString INFINITY_DECORATION_ID = "infinity-decorations";
@@ -35,7 +34,7 @@ public:
KisInfinityManager(KisView2 *view, KisCanvas2 *canvas);
protected:
- void drawDecoration(QPainter& gc, const QRectF& updateArea, const KisCoordinatesConverter *converter);
+ void drawDecoration(QPainter& gc, const QRectF& updateArea, const KisCoordinatesConverter *converter, KisCanvas2 *canvas);
bool eventFilter(QObject *obj, QEvent *event);
public slots:
lines 1-38/38 (END)
</pre>
<br />
<p>- Boudewijn</p>
<br />
<p>On May 14th, 2013, 5:46 p.m. UTC, Shivaraman Aiyer wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Calligra.</div>
<div>By Shivaraman Aiyer.</div>
<p style="color: grey;"><i>Updated May 14, 2013, 5:46 p.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Perspective Grid has a feature of creating a new grid from its side handles, snapping two of the handles to the parent grid. As Perspective Assistant is more flexible, it was a better option to put the side handle feature to it. This diff enables the Perspective Assistant to create new Perspective Assistant from the current Assistants.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Basic preliminary testing done include:
1) Test if rest of the Assistants are working - done, passed
2) Test the working of the side handles - done, passed
3) Test if all the assistants working together - done, passed
4) Test if the special cases are also working - done, passed</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>krita/plugins/assistants/RulerAssistant/PerspectiveAssistant.h <span style="color: grey">(16cd814)</span></li>
<li>krita/plugins/assistants/RulerAssistant/PerspectiveAssistant.cc <span style="color: grey">(13e8f32)</span></li>
<li>krita/plugins/assistants/RulerAssistant/kis_ruler_assistant_tool.h <span style="color: grey">(e3bee14)</span></li>
<li>krita/plugins/assistants/RulerAssistant/kis_ruler_assistant_tool.cc <span style="color: grey">(34b8a71)</span></li>
<li>krita/plugins/assistants/RulerAssistant/ruler_assistant_tool.cc <span style="color: grey">(fc9ab85)</span></li>
<li>krita/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc <span style="color: grey">(4f6dee4)</span></li>
<li>krita/ui/CMakeLists.txt <span style="color: grey">(37e4635)</span></li>
<li>krita/ui/canvas/kis_canvas_decoration.h <span style="color: grey">(c9ed223)</span></li>
<li>krita/ui/canvas/kis_canvas_decoration.cc <span style="color: grey">(5157679)</span></li>
<li>krita/ui/canvas/kis_canvas_widget_base.cpp <span style="color: grey">(166a529)</span></li>
<li>krita/ui/canvas/kis_grid_manager.h <span style="color: grey">(ada17a6)</span></li>
<li>krita/ui/canvas/kis_grid_manager.cpp <span style="color: grey">(efd6c7b)</span></li>
<li>krita/ui/canvas/kis_perspective_grid_manager.h <span style="color: grey">(5a4753e)</span></li>
<li>krita/ui/canvas/kis_perspective_grid_manager.cpp <span style="color: grey">(2d6d339)</span></li>
<li>krita/ui/kis_painting_assistant.h <span style="color: grey">(2fb513c)</span></li>
<li>krita/ui/kis_painting_assistant.cc <span style="color: grey">(9fd2ec3)</span></li>
<li>krita/ui/kis_painting_assistants_manager.h <span style="color: grey">(7ca4119)</span></li>
<li>krita/ui/kis_painting_assistants_manager.cc <span style="color: grey">(6f9ddbb)</span></li>
<li>krita/ui/kis_selection_decoration.h <span style="color: grey">(cf86ada)</span></li>
<li>krita/ui/kis_selection_decoration.cc <span style="color: grey">(d442729)</span></li>
<li>krita/ui/kra/kis_kra_saver.cpp <span style="color: grey">(c84b0c7)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/110244/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>