Merge branch 'main' into session/builder-roads

2026-11-08 21:55:44 +01:00
parent dfefb2d7fb 43b8b1556d
commit 8c907a5215
9 changed files with 482 additions and 51 deletions
@@ -147,6 +147,31 @@ protected:
    int m_cityProjectTab = 0; // 0 = Buildings, 1 = Units
    QRect m_tabBuildingsRect;
    QRect m_tabUnitsRect;
+
+    void drawCityResourceMenu(QPainter &painter, const QMatrix4x4 &vMatrix);
+    void onSlotLongPressTimeout();
+
+    // Slot Long Press & Resource Selection Menu State
+    bool m_slotPressPending = false;
+    bool m_slotLongPressTriggered = false;
+    int m_pressedSlotTx = -1;
+    int m_pressedSlotTy = -1;
+    QPoint m_slotPressPos;
+    QElapsedTimer m_slotPressElapsed;
+    QTimer *m_slotLongPressTimer = nullptr;
+
+    bool m_resourceMenuOpen = false;
+    int m_resourceMenuTx = -1;
+    int m_resourceMenuTy = -1;
+    QRect m_resourceMenuRect;
+    QRect m_resourceMenuCloseBtnRect;
+
+    struct CityResourceChoiceHit {
+        QRect rect;
+        QString res;
+        int amount;
+    };
+    std::vector<CityResourceChoiceHit> m_cityResourceChoiceHits;
 };

 #endif // QSCENERENDERER_H