improve drag and drop, allow it by default inTreeViewMemoryFields

spelunky-fyi · May 19, 2024 · 57c0249 · 57c0249
1 parent 58e5784
commit 57c0249
Show file tree

Hide file tree

Showing 8 changed files with 298 additions and 71 deletions.
diff --git a/include/Configuration.h b/include/Configuration.h
@@ -52,10 +52,6 @@ namespace S2Plugin
     constexpr uint16_t gsRoleSize = Qt::UserRole + 10;
     constexpr uint16_t gsRoleEntityAddress = Qt::UserRole + 11; // for entity uid to not look for the uid twice
 
-    constexpr char* gsJSONDragDropMemoryField_UID = "uid";
-    constexpr char* gsJSONDragDropMemoryField_Address = "addr";
-    constexpr char* gsJSONDragDropMemoryField_Type = "type";
-
     // new types need to be added to
     // - the MemoryFieldType enum
     // - gsMemoryFieldType in Configuration.cpp
@@ -177,8 +173,8 @@ namespace S2Plugin
         RoomCode(uint16_t _id, std::string _name, QColor _color) : id(_id), name(_name), color(_color){};
     };
 
-    Q_DECLARE_METATYPE(S2Plugin::MemoryFieldType)
-    Q_DECLARE_METATYPE(std::string)
+    Q_DECLARE_METATYPE(S2Plugin::MemoryFieldType);
+    Q_DECLARE_METATYPE(std::string);
 
     class Configuration
     {

diff --git a/include/QtHelpers/TreeViewMemoryFields.h b/include/QtHelpers/TreeViewMemoryFields.h
@@ -19,6 +19,12 @@ namespace S2Plugin
 {
     struct MemoryField;
 
+    constexpr char* gsDragDropMemoryField_UID = "uid";
+    constexpr char* gsDragDropMemoryField_Address = "addr";
+    constexpr char* gsDragDropMemoryField_Type = "type";
+    constexpr char* gsDragDropMemoryField_IsPointer = "pointer";
+    constexpr char* gsDragDropMemoryField_RefName = "ref";
+
     struct ColumnFilter
     {
         constexpr ColumnFilter& enable(uint8_t h)
@@ -84,7 +90,7 @@ namespace S2Plugin
       signals:
         void memoryFieldValueUpdated(int row, QStandardItem* parrent);
         void levelGenRoomsPointerClicked();
-        void entityOffsetDropped(size_t offset);
+        void offsetDropped(uintptr_t offset);
 
       private slots:
         void cellClicked(const QModelIndex& index);

diff --git a/include/Spelunky2.h b/include/Spelunky2.h
@@ -3,6 +3,7 @@
 #include "Data/CharacterDB.h"
 #include "Data/EntityDB.h"
 #include "Data/ParticleDB.h"
+#include "Data/State.h"
 #include "Data/StringsTable.h"
 #include "Data/TextureDB.h"
 #include "Data/VirtualTableLookup.h"
@@ -44,6 +45,10 @@ namespace S2Plugin
         const EntityDB& get_EntityDB();
         const StringsTable& get_StringsTable();
         const VirtualTableLookup& get_VirtualTableLookup();
+        State get_State() const
+        {
+            return State{get_StatePtr()};
+        }
         //
 
         uintptr_t find(const char* pattern, uintptr_t start = 0, size_t size = 0) const;

diff --git a/include/Views/ViewEntity.h b/include/Views/ViewEntity.h
@@ -30,7 +30,7 @@ namespace S2Plugin
         void refreshEntity();
         void interpretAsChanged(const QString& text);
         void label();
-        void entityOffsetDropped(size_t entityOffset);
+        void entityOffsetDropped(uintptr_t entityOffset);
         void tabChanged();
 
       private:

diff --git a/src/QtHelpers/TableViewLogger.cpp b/src/QtHelpers/TableViewLogger.cpp
@@ -3,6 +3,7 @@
 #include "Data/Logger.h"
 #include "QtHelpers/ItemModelLoggerFields.h"
 #include "QtHelpers/StyledItemDelegateColorPicker.h"
+#include "QtHelpers/TreeViewMemoryFields.h"
 #include "QtPlugin.h"
 #include <QColorDialog>
 #include <QFont>
@@ -13,7 +14,6 @@
 #include <QPainter>
 #include <QTextCodec>
 #include <QUuid>
-#include <nlohmann/json.hpp>
 
 S2Plugin::TableViewLogger::TableViewLogger(Logger* logger, QWidget* parent) : QTableView(parent), mLogger(logger)
 {
@@ -30,18 +30,14 @@ S2Plugin::TableViewLogger::TableViewLogger(Logger* logger, QWidget* parent) : QT
 
 void S2Plugin::TableViewLogger::dragEnterEvent(QDragEnterEvent* event)
 {
-    if (event->mimeData()->hasFormat("spelunky/memoryfield"))
-    {
+    if (event->mimeData()->property(gsDragDropMemoryField_UID).isValid())
         event->acceptProposedAction();
-    }
 }
 
 void S2Plugin::TableViewLogger::dragMoveEvent(QDragMoveEvent* event)
 {
-    if (event->mimeData()->hasFormat("spelunky/memoryfield"))
-    {
+    if (event->mimeData()->property(gsDragDropMemoryField_UID).isValid())
         event->accept();
-    }
 }
 
 void S2Plugin::TableViewLogger::dropEvent(QDropEvent* event)
@@ -50,14 +46,8 @@ void S2Plugin::TableViewLogger::dropEvent(QDropEvent* event)
 
     auto fieldsModel = qobject_cast<ItemModelLoggerFields*>(model());
 
-    auto dropData = event->mimeData()->data("spelunky/memoryfield");
-    auto codec = QTextCodec::codecForName("UTF-8");
-    auto str = codec->toUnicode(dropData);
-
-    auto j = nlohmann::json::parse(str.toStdString());
-
     LoggerField field;
-    field.type = static_cast<MemoryFieldType>(j[gsJSONDragDropMemoryField_Type].get<uint64_t>());
+    field.type = event->mimeData()->property(gsDragDropMemoryField_Type).value<MemoryFieldType>();
     switch (field.type)
     {
         // List allowed types
@@ -97,8 +87,8 @@ void S2Plugin::TableViewLogger::dropEvent(QDropEvent* event)
         }
     }
     field.uuid = QUuid::createUuid().toString().toStdString();
-    field.memoryAddr = j[gsJSONDragDropMemoryField_Address].get<uint64_t>();
-    field.name = j[gsJSONDragDropMemoryField_UID].get<std::string>();
+    field.memoryAddr = event->mimeData()->property(gsDragDropMemoryField_Address).toULongLong();
+    field.name = event->mimeData()->property(gsDragDropMemoryField_UID).toString().toStdString();
     field.color = defaultColors[fieldsModel->rowCount() % defaultColors.size()];
 
     mLogger->addField(field);