fix wstring, fix crash when clicking empty field in ThreadsView, impr…

…ove the look of memory tree, fix other small stuff in memory tree, rename `ThemeInfoName` -> `ThemeInfoPointer`

include/Configuration.h

@@ -115,7 +115,7 @@ namespace S2Plugin
         EntitySubclass,               // a subclass of an entity defined in json
         DefaultStructType,            // a struct defined in json
         UndeterminedThemeInfoPointer, // used to look up the theme pointer in the levelgen and show the correct theme name
-        ThemeInfoName,                // same as above, but does not add struct tree
+        ThemeInfoPointer,                // same as above, but does not add struct tree
         LevelGenRoomsPointer,         // used to make the level gen rooms title clickable
         LevelGenRoomsMetaPointer,     // used to make the level gen rooms title clickable
         JournalPagePointer,           // used to make journal page in vector clickable

include/Data/StdString.h

@@ -76,5 +76,5 @@ namespace S2Plugin
     };
 
     using StdString = StdBasicString<char>;
-    using StdWstring = StdBasicString<char16_t>;
+    using StdWstring = StdBasicString<ushort>;
 } // namespace S2Plugin

include/QtHelpers/TreeViewMemoryFields.h

@@ -46,11 +46,16 @@ namespace S2Plugin
       public:
         TreeViewMemoryFields(QWidget* parent = nullptr);
 
-        void addMemoryFields(const std::vector<MemoryField>& fields, const std::string& mainName, uintptr_t structAddr, size_t initialDelta = 0, QStandardItem* parent = nullptr);
-        QStandardItem* addMemoryField(const MemoryField& field, const std::string& fieldNameOverride, uintptr_t memoryAddress, size_t delta, QStandardItem* parent = nullptr);
+        void addMemoryFields(const std::vector<MemoryField>& fields, const std::string& mainName, uintptr_t structAddr, size_t initialDelta = 0, uint8_t deltaPrefixCount = 0,
+                             QStandardItem* parent = nullptr);
+        QStandardItem* addMemoryField(const MemoryField& field, const std::string& fieldNameOverride, uintptr_t memoryAddress, size_t delta, uint8_t deltaPrefixCount = 0,
+                                      QStandardItem* parent = nullptr);
         void clear();
         void updateTableHeader(bool restoreColumnWidths = true);
-        void setEnableChangeHighlighting(bool b) noexcept;
+        void setEnableChangeHighlighting(bool b) noexcept
+        {
+            mEnableChangeHighlighting = b;
+        }
 
         void updateTree(uintptr_t newAddr, uintptr_t newComparisonAddr = 0, bool initial = false);
         void updateRow(int row, std::optional<uintptr_t> newAddr = std::nullopt, std::optional<uintptr_t> newAddrComparison = std::nullopt, QStandardItem* parent = nullptr,

resources/Spelunky2.json

@@ -9051,7 +9051,7 @@
       { "field": "padding3?", "type": "UnsignedDword" },
       {
         "field": "sub_theme",
-        "type": "ThemeInfoName",
+        "type": "ThemeInfoPointer",
         "comment": "for cosmic ocean"
       },
       { "field": "unknown3", "type": "UnsignedDword" },

resources/spelunky2.qrc

@@ -1,5 +1,20 @@
 <RCC>
-    <qresource prefix="/icons">
-        <file>caveman.png</file>
-    </qresource>
+  <qresource prefix="/icons">
+    <file>caveman.png</file>
+  </qresource>
+  <qresource prefix="/images">
+    <file alias="vline.png">stylesheet-vline.png</file>
+  </qresource>
+  <qresource prefix="/images">
+    <file alias="branch-more.png">stylesheet-branch-more.png</file>
+  </qresource>
+  <qresource prefix="/images">
+    <file alias="branch-end.png">stylesheet-branch-end.png</file>
+  </qresource>
+  <qresource prefix="/images">
+    <file alias="branch-closed.png">stylesheet-branch-closed.png</file>
+  </qresource>
+  <qresource prefix="/images">
+    <file alias="branch-open.png">stylesheet-branch-open.png</file>
+  </qresource>
 </RCC>

src/Configuration.cpp

@@ -134,7 +134,7 @@ namespace S2Plugin
         {MemoryFieldType::ConstCharPointer, "Const char*", "const char*", "ConstCharPointer", 8, true},
         {MemoryFieldType::ConstCharPointerPointer, "Const char**", "const char**", "ConstCharPointerPointer", 8, true},                         // there is more then just pointer to pointer?
         {MemoryFieldType::UndeterminedThemeInfoPointer, "UndeterminedThemeInfoPointer", "ThemeInfo*", "UndeterminedThemeInfoPointer", 8, true}, // display theme name and add ThemeInfo fields
-        {MemoryFieldType::ThemeInfoName, "ThemeInfoName", "ThemeInfo*", "ThemeInfoName", 8, true},                                              // just theme name
+        {MemoryFieldType::ThemeInfoPointer, "ThemeInfoPointer", "ThemeInfo*", "ThemeInfoPointer", 8, true},                                              // just theme name
         {MemoryFieldType::LevelGenRoomsPointer, "LevelGenRoomsPointer", "LevelGenRooms*", "LevelGenRoomsPointer", 8, true},
         {MemoryFieldType::LevelGenRoomsMetaPointer, "LevelGenRoomsMetaPointer", "LevelGenRoomsMeta*", "LevelGenRoomsMetaPointer", 8, true},
         {MemoryFieldType::JournalPagePointer, "JournalPagePointer", "JournalPage*", "JournalPagePointer", 8, true},

src/QtHelpers/StyledItemDelegateHTML.cpp

@@ -1,5 +1,7 @@
 #include "QtHelpers/StyledItemDelegateHTML.h"
+#include <QAbstractTextDocumentLayout>
 #include <QPainter>
+#include <QSize>
 #include <QTextDocument>
 
 void S2Plugin::StyledItemDelegateHTML::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
@@ -14,7 +16,7 @@ void S2Plugin::StyledItemDelegateHTML::paint(QPainter* painter, const QStyleOpti
 
     options.text = "";
     options.widget->style()->drawControl(QStyle::CE_ItemViewItem, &options, painter);
-
+    QSize iconSize = options.icon.actualSize(options.rect.size());
     if (mCenterVertically)
     {
         doc.setTextWidth(options.rect.width());
@@ -23,10 +25,19 @@ void S2Plugin::StyledItemDelegateHTML::paint(QPainter* painter, const QStyleOpti
     }
     else
     {
-        painter->translate(options.rect.left(), options.rect.top() - 2);
+        painter->translate(options.rect.left() + iconSize.width(), options.rect.top() - 2);
     }
-    QRect clip(0, 0, options.rect.width(), options.rect.height());
-    doc.drawContents(painter, clip);
+    QRect clip(0, 0, options.rect.width() + iconSize.width(), options.rect.height());
+    // doc.drawContents(painter, clip);
+
+    painter->setClipRect(clip);
+    QAbstractTextDocumentLayout::PaintContext ctx;
+    auto newColor = index.data(Qt::TextColorRole);
+    if (!newColor.isNull())
+        ctx.palette.setColor(QPalette::Text, newColor.value<QColor>());
+
+    ctx.clip = clip;
+    doc.documentLayout()->draw(painter, ctx);
 
     painter->restore();
 }