Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-10-01 12:26:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into connections

Browse Source
This commit is contained in:
GriffinR
2024-08-21 02:18:49 -04:00
committed by GitHub
parent d154f47d98 baaf9c8c9d
commit 4f4e8105cd
4 changed files with 39 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/mainwindow.h
View File

@@ -223,7 +223,7 @@ private slots:
void on_toolButton_deleteObject_clicked();
void addNewEvent(Event::Type type);
void tryAddEventTab(QWidget * tab, Event::Group group);
void tryAddEventTab(QWidget * tab);
void displayEventTabs();
void updateSelectedObjects();
void updateObjects();
@@ -331,19 +331,10 @@ private:
QAction *copyAction = nullptr;
QAction *pasteAction = nullptr;
QWidget *eventTabObjectWidget;
QWidget *eventTabWarpWidget;
QWidget *eventTabTriggerWidget;
QWidget *eventTabBGWidget;
QWidget *eventTabHealspotWidget;
QWidget *eventTabMultipleWidget;
QMap<Event::Group, DraggablePixmapItem*> lastSelectedEvent;
bool isProgrammaticEventTabChange;
bool newMapDefaultsSet = false;
MapSortOrder mapSortOrder;
bool tilesetNeedsRedraw = false;
bool userSetMap(QString, bool scrollTreeView = false);