Update with latest

src/tiled/abstractobjecttool.cpp

@@ -40,6 +40,7 @@
 #include "tile.h"
 #include "tmxmapformat.h"
 #include "utils.h"
+#include "invertyaxishelper.h"
 
 #include <QFileDialog>
 #include <QGraphicsView>
@@ -186,7 +187,10 @@ void AbstractObjectTool::mouseMoved(const QPointF &pos,
     const QPointF tilePosF = mapDocument()->renderer()->screenToTileCoords(offsetPos);
     const int x = qFloor(tilePosF.x());
     const int y = qFloor(tilePosF.y());
-    setStatusInfo(QStringLiteral("%1, %2 (%3, %4)").arg(x).arg(y).arg(pixelPos.x()).arg(pixelPos.y()));
+    setStatusInfo(QStringLiteral("%1, %2 (%3, %4)").arg(x)
+                                                   .arg(InvertYAxisHelper(mapDocument()).tileY(y))
+                                                   .arg(pixelPos.x())
+                                                   .arg(InvertYAxisHelper(mapDocument()).pixelY(pixelPos.y())));
 }
 
 void AbstractObjectTool::mousePressed(QGraphicsSceneMouseEvent *event)

src/tiled/abstracttiletool.cpp

@@ -27,6 +27,7 @@
 #include "mapscene.h"
 #include "tilelayer.h"
 #include "tilestamp.h"
+#include "invertyaxishelper.h"
 
 #include <QKeyEvent>
 #include <QtMath>
@@ -196,7 +197,7 @@ void AbstractTileTool::updateStatusInfo()
 
         setStatusInfo(QStringLiteral("%1, %2 [%3]")
                       .arg(mTilePosition.x())
-                      .arg(mTilePosition.y())
+                      .arg(InvertYAxisHelper(mapDocument()).tileY(mTilePosition.y()))
                       .arg(tileIdString));
     } else {
         setStatusInfo(QString());

src/tiled/invertyaxishelper.h

@@ -0,0 +1,68 @@
+/*
+ * invertyaxishelper.h
+ * Copyright 2013, Thorbjørn Lindeijer <[email protected]>
+ * Copyright 2018, Adrian Frances <[email protected]>
+ *
+ * This file is part of Tiled.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "mapdocument.h"
+#include "maprenderer.h"
+
+namespace Tiled {
+
+class InvertYAxisHelper
+{
+public:
+    InvertYAxisHelper(MapDocument *mapDocument)
+        : mMapDocument(mapDocument)
+    {}
+
+    int tileY(int y) const;
+    qreal pixelY(qreal y) const;
+
+private:
+    MapDocument *mMapDocument;
+};
+
+/**
+ * Inverts Y coordinate in tiles when applicable.
+ */
+inline int InvertYAxisHelper::tileY(int y) const
+{
+    // Check if Invert Y Axis is set
+    if (true)
+        return mMapDocument->map()->height() - 1 - y;
+    return y;
+}
+
+/**
+ * Inverts Y coordinate in pixels when applicable.
+ */
+inline qreal InvertYAxisHelper::pixelY(qreal y) const
+{
+    // Obtain the map document
+    if (true) {
+        const MapRenderer *renderer = mMapDocument->renderer();
+        QRect boundingRect = renderer->boundingRect(QRect(QPoint(), mMapDocument->map()->size()));
+        return boundingRect.height() - y;
+    }
+    return y;
+}
+
+} // Namespace Tiled