fix crash in editors, enable close in editors, disable expanding inst…

…ance to prevent crash on dbl click, force the room editor to constantly redraw

Editors/BackgroundEditor.cpp

@@ -18,6 +18,8 @@ BackgroundEditor::BackgroundEditor(ProtoModel* model, QWidget* parent)
     : BaseEditor(model, parent), ui(new Ui::BackgroundEditor) {
   ui->setupUi(this);
 
+  connect(ui->actionSave, &QAction::triggered, this, &BaseEditor::OnSave);
+
   ui->backgroundView->SetResourceModel(resMapper->GetModel());
 
   resMapper->addMapping(ui->smoothCheckBox, Background::kSmoothEdgesFieldNumber);
@@ -40,11 +42,6 @@ void BackgroundEditor::dataChanged(const QModelIndex& topLeft, const QModelIndex
   ui->backgroundView->update();
 }
 
-void BackgroundEditor::on_actionSave_triggered() {
-  resMapper->SetDirty(false);
-  this->parentWidget()->close();
-}
-
 void BackgroundEditor::on_actionZoomIn_triggered() {
   ui->backgroundView->SetZoom(ui->backgroundView->GetZoom() * 2);
 }

Editors/BackgroundEditor.h

@@ -19,7 +19,6 @@ class BackgroundEditor : public BaseEditor {
  private slots:
   void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVariant &oldValue = QVariant(0),
                    const QVector<int> &roles = QVector<int>()) override;
-  void on_actionSave_triggered();
   void on_actionZoomIn_triggered();
   void on_actionZoomOut_triggered();
   void on_actionZoom_triggered();

Editors/BaseEditor.cpp

@@ -20,7 +20,7 @@ void BaseEditor::closeEvent(QCloseEvent* event) {
       return;
     } else if (reply == QMessageBox::No) {
       nodeMapper->clearMapping();
-      nodeMapper->RestoreBuffer();
+      resMapper->RestoreBuffer();
       resMapper->clearMapping();
     }
   }
@@ -45,3 +45,8 @@ void BaseEditor::dataChanged(const QModelIndex& topLeft, const QModelIndex& /*bo
     emit ResourceRenamed(n->type_case(), oldValue.toString(), QString::fromStdString(n->name()));
   }
 }
+
+void BaseEditor::OnSave() {
+  resMapper->SetDirty(false);
+  this->parentWidget()->close();
+}

Editors/BaseEditor.h

@@ -31,6 +31,7 @@ class BaseEditor : public QWidget {
  public slots:
   virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
                            const QVariant &oldValue = QVariant(0), const QVector<int> &roles = QVector<int>());
+  void OnSave();
 
  protected:
   ModelMapper *nodeMapper;

Editors/CodeEditor.cpp

@@ -4,6 +4,8 @@
 CodeEditor::CodeEditor(ProtoModel *model, QWidget *parent) : BaseEditor(model, parent), ui(new Ui::CodeEditor) {
   ui->setupUi(this);
 
+  connect(ui->actionSave, &QAction::triggered, this, &BaseEditor::OnSave);
+
   cursorPositionLabel = new QLabel(ui->statusBar);
   lineCountLabel = new QLabel(ui->statusBar);
 

Editors/FontEditor.cpp

@@ -4,6 +4,7 @@
 
 FontEditor::FontEditor(ProtoModel* model, QWidget* parent) : BaseEditor(model, parent), ui(new Ui::FontEditor) {
   ui->setupUi(this);
+  connect(ui->saveButton, &QAbstractButton::pressed, this, &BaseEditor::OnSave);
 }
 
 FontEditor::~FontEditor() { delete ui; }

Editors/ObjectEditor.cpp

@@ -4,6 +4,7 @@
 
 ObjectEditor::ObjectEditor(ProtoModel* model, QWidget* parent) : BaseEditor(model, parent), ui(new Ui::ObjectEditor) {
   ui->setupUi(this);
+  connect(ui->saveButton, &QAbstractButton::pressed, this, &BaseEditor::OnSave);
 }
 
 ObjectEditor::~ObjectEditor() { delete ui; }

Editors/PathEditor.cpp

@@ -4,6 +4,7 @@
 
 PathEditor::PathEditor(ProtoModel* model, QWidget* parent) : BaseEditor(model, parent), ui(new Ui::PathEditor) {
   ui->setupUi(this);
+  connect(ui->actionSave, &QAction::triggered, this, &BaseEditor::OnSave);
 }
 
 PathEditor::~PathEditor() { delete ui; }

Editors/RoomEditor.cpp

@@ -13,11 +13,13 @@
 #include <QMouseEvent>
 
 #include <algorithm>
+#include <QDebug>
 
 using View = buffers::resources::Room::View;
 
 RoomEditor::RoomEditor(ProtoModel* model, QWidget* parent) : BaseEditor(model, parent), ui(new Ui::RoomEditor) {
   ui->setupUi(this);
+  connect(ui->actionSave, &QAction::triggered, this, &BaseEditor::OnSave);
 
   ProtoModel* roomModel = model->GetSubModel(TreeNode::kRoomFieldNumber);
   ui->roomView->SetResourceModel(roomModel);

Editors/RoomEditor.ui

@@ -142,6 +142,15 @@
               <property name="uniformRowHeights">
                <bool>true</bool>
               </property>
+              <property name="itemsExpandable">
+               <bool>false</bool>
+              </property>
+              <property name="sortingEnabled">
+               <bool>false</bool>
+              </property>
+              <property name="expandsOnDoubleClick">
+               <bool>false</bool>
+              </property>
              </widget>
             </item>
             <item>
@@ -207,10 +216,10 @@
            <attribute name="horizontalHeaderCascadingSectionResizes">
             <bool>true</bool>
            </attribute>
-           <attribute name="horizontalHeaderDefaultSectionSize">
+           <attribute name="horizontalHeaderMinimumSectionSize">
             <number>24</number>
            </attribute>
-           <attribute name="horizontalHeaderMinimumSectionSize">
+           <attribute name="horizontalHeaderDefaultSectionSize">
             <number>24</number>
            </attribute>
            <attribute name="horizontalHeaderStretchLastSection">
@@ -219,10 +228,10 @@
            <attribute name="verticalHeaderCascadingSectionResizes">
             <bool>true</bool>
            </attribute>
-           <attribute name="verticalHeaderDefaultSectionSize">
+           <attribute name="verticalHeaderMinimumSectionSize">
             <number>24</number>
            </attribute>
-           <attribute name="verticalHeaderMinimumSectionSize">
+           <attribute name="verticalHeaderDefaultSectionSize">
             <number>24</number>
            </attribute>
           </widget>
@@ -1278,8 +1287,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>694</width>
-            <height>569</height>
+            <width>712</width>
+            <height>572</height>
            </rect>
           </property>
           <property name="autoFillBackground">

Editors/SoundEditor.cpp

@@ -3,6 +3,7 @@
 
 SoundEditor::SoundEditor(ProtoModel* model, QWidget* parent) : BaseEditor(model, parent), ui(new Ui::SoundEditor) {
   ui->setupUi(this);
+  connect(ui->saveButton, &QAbstractButton::pressed, this, &BaseEditor::OnSave);
 }
 
 SoundEditor::~SoundEditor() { delete ui; }

Editors/SpriteEditor.cpp

@@ -7,6 +7,8 @@
 SpriteEditor::SpriteEditor(ProtoModel* model, QWidget* parent) : BaseEditor(model, parent), ui(new Ui::SpriteEditor) {
   ui->setupUi(this);
 
+  connect(ui->actionSave, &QAction::triggered, this, &BaseEditor::OnSave);
+
   spriteModel =
       new SpriteModel(static_cast<buffers::resources::Sprite*>(model->GetSubModel(TreeNode::kSpriteFieldNumber)->GetBuffer())->mutable_subimages(), this);
 

Editors/SpriteEditor.ui

@@ -252,8 +252,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>608</width>
-           <height>311</height>
+           <width>631</width>
+           <height>312</height>
           </rect>
          </property>
          <property name="autoFillBackground">

Widgets/RoomView.cpp

@@ -34,6 +34,8 @@ void RoomView::paintEvent(QPaintEvent* /* event */) {
   this->paintInstances(painter, room);
   this->paintBackgrounds(painter, room, true);
   this->paintGrid(painter, room);
+
+  update(); // request repaint constantly
 }
 
 void RoomView::paintTiles(QPainter& painter, Room* room) {