Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-09-09 09:25:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #505 from GriffinRichards/connection-warp

Browse Source 
Allow navigating to connected maps from any tab
This commit is contained in:
t
2023-01-16 15:46:49 -05:00
committed by GitHub
parent d29506d755 5ef4fbafbc
commit debf9d99f0
6 changed files with 73 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/editor.h
View File

@@ -110,8 +110,7 @@ public:
QGraphicsPixmapItem *current_view = nullptr;
MapPixmapItem *map_item = nullptr;
ConnectionPixmapItem* selected_connection_item = nullptr;
QList<QGraphicsPixmapItem*> connection_items;
QList<ConnectionPixmapItem*> connection_edit_items;
QList<ConnectionPixmapItem*> connection_items;
QGraphicsPathItem *connection_mask = nullptr;
CollisionPixmapItem *collision_item = nullptr;
QGraphicsItemGroup *events_group = nullptr;
@@ -166,7 +165,8 @@ private:
void setBorderItemsVisible(bool, qreal = 1);
void setConnectionEditControlValues(MapConnection*);
void setConnectionEditControlsEnabled(bool);
void createConnectionItem(MapConnection* connection, bool hide);
void setConnectionsEditable(bool);
void createConnectionItem(MapConnection* connection);
void populateConnectionMapPickers();
void setDiveEmergeControls();
void updateDiveEmergeMap(QString mapName, QString direction);

3
include/ui/connectionpixmapitem.h
View File

@@ -29,6 +29,9 @@ public:
void render(qreal opacity = 1);
int getMinOffset();
int getMaxOffset();
void setEditable(bool editable);
bool getEditable();
void updateHighlight(bool selected);
protected:
QVariant itemChange(GraphicsItemChange change, const QVariant &value);