atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix Qt6 build and overloaded addPath ordering

Browse source
This commit is contained in:
Marcus Huderle 2022-10-15 11:33:12 -05:00
parent ca04b99576
commit ad01ba0feb
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/ui/mapview.h
View file

@ -57,9 +57,8 @@ public:
Q_INVOKABLE void rotate(int degrees);
Q_INVOKABLE void addText(QString text, int x, int y, QString color = "#000000", int fontSize = 12, int layer = 0);
Q_INVOKABLE void addRect(int x, int y, int width, int height, QString borderColor = "#000000", QString fillColor = "transparent", int rounding = 0, int layer = 0);
Q_INVOKABLE void addPath(QList<QList<int>> coords, QString borderColor = "#000000", QString fillColor = "transparent", int layer = 0);
Q_INVOKABLE void addPath(QList<int> xCoords, QList<int> yCoords, QString borderColor = "#000000", QString fillColor = "transparent", int layer = 0);
// TODO: Not invokable, haven't successfully tested 2D js array --> QList<QList<int>>.
void addPath(QList<QList<int>> coords, QString borderColor = "#000000", QString fillColor = "transparent", int layer = 0);
Q_INVOKABLE void addImage(int x, int y, QString filepath, int layer = 0, bool useCache = true);
Q_INVOKABLE void createImage(int x, int y, QString filepath,
int width = -1, int height = -1, int xOffset = 0, int yOffset = 0,

1
include/ui/overlay.h
View file

@ -6,6 +6,7 @@
#include <QColor>
#include <QPainter>
#include <QStaticText>
#include <QPainterPath>
class OverlayItem {
public: