mirror of
https://github.com/huderlem/porymap.git
synced 2026-08-25 10:05:46 -05:00
Fix minor issues with resize layout
This commit is contained in:
@@ -34,6 +34,7 @@
|
||||
#include "mapheaderform.h"
|
||||
#include "newlayoutdialog.h"
|
||||
#include "message.h"
|
||||
#include "resizelayoutpopup.h"
|
||||
|
||||
|
||||
|
||||
@@ -253,8 +254,8 @@ private slots:
|
||||
|
||||
void on_actionTileset_Editor_triggered();
|
||||
|
||||
void moveEvent(QMoveEvent *event);
|
||||
void closeEvent(QCloseEvent *);
|
||||
void moveEvent(QMoveEvent *event) override;
|
||||
void closeEvent(QCloseEvent *) override;
|
||||
|
||||
void eventTabChanged(int index);
|
||||
|
||||
@@ -326,6 +327,7 @@ private:
|
||||
QPointer<WildMonChart> wildMonChart = nullptr;
|
||||
QPointer<WildMonSearch> wildMonSearch = nullptr;
|
||||
QPointer<QuestionMessage> fileWatcherWarning = nullptr;
|
||||
QPointer<ResizeLayoutPopup> resizeLayoutPopup = nullptr;
|
||||
|
||||
QAction *undoAction = nullptr;
|
||||
QAction *redoAction = nullptr;
|
||||
|
||||
@@ -9,11 +9,13 @@
|
||||
#include <QDialogButtonBox>
|
||||
|
||||
class ResizableRect;
|
||||
class Editor;
|
||||
namespace Ui {
|
||||
class ResizeLayoutPopup;
|
||||
}
|
||||
|
||||
class Layout;
|
||||
class Project;
|
||||
|
||||
|
||||
|
||||
/// Custom scene that paints its background a gray checkered pattern.
|
||||
@@ -68,7 +70,7 @@ class ResizeLayoutPopup : public QDialog
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
ResizeLayoutPopup(QWidget *parent, Editor *editor);
|
||||
ResizeLayoutPopup(QWidget *parent, Layout *layout, Project *project);
|
||||
~ResizeLayoutPopup();
|
||||
|
||||
void setupLayoutView();
|
||||
@@ -96,7 +98,8 @@ private slots:
|
||||
|
||||
private:
|
||||
QWidget *parent = nullptr;
|
||||
Editor *editor = nullptr;
|
||||
QPointer<Layout> layout = nullptr;
|
||||
QPointer<Project> project = nullptr;
|
||||
|
||||
Ui::ResizeLayoutPopup *ui;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user