From a3ecbecd20e01cc091290f8bc0fdf28b43964693 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 11 Jan 2019 08:52:44 -0600 Subject: [PATCH] Don't show cursor tile outline in event or connection editing tabs --- include/ui/cursortilerect.h | 2 ++ src/editor.cpp | 4 ++++ src/ui/cursortilerect.cpp | 8 +++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/ui/cursortilerect.h b/include/ui/cursortilerect.h index 4edbcae4..c2bd24c9 100644 --- a/include/ui/cursortilerect.h +++ b/include/ui/cursortilerect.h @@ -57,8 +57,10 @@ public: void setNormalPathMode(); void updateLocation(int x, int y); void updateSelectionSize(int width, int height); + void setVisibility(bool visible); bool *enabled; private: + bool visible; int width; int height; bool anchored; diff --git a/src/editor.cpp b/src/editor.cpp index 72960f95..114ecd20 100644 --- a/src/editor.cpp +++ b/src/editor.cpp @@ -76,6 +76,7 @@ void Editor::setEditingMap() { setBorderItemsVisible(ui->checkBox_ToggleBorder->isChecked()); setConnectionItemsVisible(false); this->cursorMapTileRect->stopSingleTileMode(); + this->cursorMapTileRect->setVisibility(true); } void Editor::setEditingCollision() { @@ -96,6 +97,7 @@ void Editor::setEditingCollision() { setBorderItemsVisible(ui->checkBox_ToggleBorder->isChecked()); setConnectionItemsVisible(false); this->cursorMapTileRect->setSingleTileMode(); + this->cursorMapTileRect->setVisibility(true); } void Editor::setEditingObjects() { @@ -114,6 +116,7 @@ void Editor::setEditingObjects() { setBorderItemsVisible(ui->checkBox_ToggleBorder->isChecked()); setConnectionItemsVisible(false); this->cursorMapTileRect->setSingleTileMode(); + this->cursorMapTileRect->setVisibility(false); } void Editor::setEditingConnections() { @@ -143,6 +146,7 @@ void Editor::setEditingConnections() { setBorderItemsVisible(true, 0.4); setConnectionItemsVisible(true); this->cursorMapTileRect->setSingleTileMode(); + this->cursorMapTileRect->setVisibility(false); } void Editor::setDiveEmergeControls() { diff --git a/src/ui/cursortilerect.cpp b/src/ui/cursortilerect.cpp index 8881e7b6..b74da4d2 100644 --- a/src/ui/cursortilerect.cpp +++ b/src/ui/cursortilerect.cpp @@ -4,6 +4,7 @@ CursorTileRect::CursorTileRect(bool *enabled, QRgb color) { this->enabled = enabled; + this->visible = true; this->color = color; this->width = 16; this->height = 16; @@ -17,6 +18,11 @@ CursorTileRect::CursorTileRect(bool *enabled, QRgb color) this->selectionHeight = 1; } +void CursorTileRect::setVisibility(bool visible) +{ + this->visible = visible; +} + void CursorTileRect::initAnchor(int coordX, int coordY) { this->anchorCoordX = coordX; @@ -96,5 +102,5 @@ void CursorTileRect::updateLocation(int coordX, int coordY) this->setX(coordX * 16); this->setY(coordY * 16); - this->setVisible(*this->enabled); + this->setVisible(*this->enabled && this->visible); }