From aa0c9fb4cbeaba895479dc8c9bb2f188f6e5856e Mon Sep 17 00:00:00 2001
From: Sam Hellawell <sshellawell@gmail.com>
Date: Sat, 16 Mar 2024 07:45:52 +0000
Subject: [PATCH] Fix: cannot drag region into map, map columns are rectangular

---
 apps/opencs/view/world/regionmap.cpp | 18 +++++++++++++++++-
 apps/opencs/view/world/regionmap.hpp |  2 ++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/world/regionmap.cpp b/apps/opencs/view/world/regionmap.cpp
index a2847848d0..5c3aa11c8e 100644
--- a/apps/opencs/view/world/regionmap.cpp
+++ b/apps/opencs/view/world/regionmap.cpp
@@ -224,6 +224,10 @@ CSVWorld::RegionMap::RegionMap(const CSMWorld::UniversalId& universalId, CSMDoc:
     addAction(mViewInTableAction);
 
     setAcceptDrops(true);
+
+    // Make columns square incase QSizeHint doesnt apply
+    for (int column = 0; column < this->model()->columnCount(); ++column)
+        this->setColumnWidth(column, this->rowHeight(0));
 }
 
 void CSVWorld::RegionMap::selectAll()
@@ -358,12 +362,24 @@ std::vector<CSMWorld::UniversalId> CSVWorld::RegionMap::getDraggedRecords() cons
     return ids;
 }
 
+void CSVWorld::RegionMap::dragMoveEvent(QDragMoveEvent* event)
+{
+    QModelIndex index = indexAt(event->pos());
+    const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData());
+    if (mime != nullptr && (mime->holdsType(CSMWorld::UniversalId::Type_Region)))
+    {
+        event->accept();
+        return;
+    }
+
+    event->ignore();
+}
+
 void CSVWorld::RegionMap::dropEvent(QDropEvent* event)
 {
     QModelIndex index = indexAt(event->pos());
 
     bool exists = QTableView::model()->data(index, Qt::BackgroundRole) != QBrush(Qt::DiagCrossPattern);
-
     if (!index.isValid() || !exists)
     {
         return;
diff --git a/apps/opencs/view/world/regionmap.hpp b/apps/opencs/view/world/regionmap.hpp
index b6c5078ea3..137b47ed83 100644
--- a/apps/opencs/view/world/regionmap.hpp
+++ b/apps/opencs/view/world/regionmap.hpp
@@ -59,6 +59,8 @@ namespace CSVWorld
 
         void mouseMoveEvent(QMouseEvent* event) override;
 
+        void dragMoveEvent(QDragMoveEvent* event) override;
+
         void dropEvent(QDropEvent* event) override;
 
     public: