keep an auto-recipe building's summary between its cycles

bin/app/data/config/world.toml

@@ -1,5 +1,5 @@
 [world]
-height_tiles = 40
+height_tiles = 30
 refund_percentage = 100
 deconstruction_time_seconds = 0.1
 starting_building_blocks = 200
@@ -15,7 +15,7 @@ building_blocks_tooltip = "Building blocks are the currency for construction. Sp
 artifact_tooltip = "Artifacts are the key to victory. Earn one by choosing the artifact reward when you destroy a set of enemy defence stations. Collect enough of them to win the game."
 
 [regions]
-asteroid_width_tiles = 60
+asteroid_width_tiles = 40
 player_buffer_width_tiles = 20
 contest_zone_width_tiles = 60
 enemy_buffer_width_tiles = 20

src/ui/SelectionPanel.cpp

@@ -1,7 +1,5 @@
 #include "SelectionPanel.h"
 
-#include <QLayout>
-#include <QList>
 #include <QScrollArea>
 #include <QScrollBar>
 #include <QVBoxLayout>
@@ -265,16 +263,9 @@ void SelectionPanel::placeIn(const QRect& viewRect, const std::vector<QRect>& oc
     // laid out, does the width it reports. Measuring at whatever width the panel
     // happens to have carries the previous card's shape into this one.
     //
-    // Each measurement re-runs the card's layouts -- every one of them, not just the
+    // Each measurement re-runs the body layout. Cards are built and discarded whole, so
-    // body's own. Changing a label's text posts a LayoutRequest to the widget holding it
+    // its cached hint describes the card before this one until it is invalidated, and
-    // and that event is only delivered when the event loop next runs, so a layout nested
+    // re-running it is also what accounts for the parts a card hides and shows as it
-    // inside the card still reports the width of the text before the change: measuring
-    // here and re-measuring on the following refresh then gives two different answers,
-    // and the panel visibly resizes a frame after its content changed. Re-activating
-    // them all is what a delivered LayoutRequest would have done.
-    //
-    // Cards are built and discarded whole, so this is also what discards the previous
-    // card's cached hints, and what accounts for the parts a card hides and shows as it
     // refreshes. The polish belongs to the same step: a freshly created chip reports an
     // unstyled hint until the stylesheet has reached it, and the chips carry border and
     // padding that change their size.
@@ -282,16 +273,6 @@ void SelectionPanel::placeIn(const QRect& viewRect, const std::vector<QRect>& oc
     {
         m_body->resize(widthPx, m_body->height());
         m_body->ensurePolished();
-
-        // Deepest first, so no layout is re-activated from children that are themselves
-        // still stale. findChildren walks parents before children, hence the reverse.
-        const QList<QLayout*> nested = m_body->findChildren<QLayout*>();
-        for (QList<QLayout*>::const_reverse_iterator it = nested.rbegin();
-             it != nested.rend(); ++it)
-        {
-            (*it)->invalidate();
-            (*it)->activate();
-        }
         m_body->layout()->invalidate();
         m_body->layout()->activate();
         return m_body->sizeHint();

src/ui/selection/SelectionContent.cpp

@@ -32,38 +32,6 @@ const int kSymbolSizePx = 20;
 const int kCardSpacingPx   = 6;
 const int kHeaderSpacingPx = 6;
 
-// The Salvage Bay has no recipe and no cycle: its two states say whether it is holding
-// scrap, not whether it is producing (REQ-BLD-SALVAGE-BAY, REQ-UI-SELECTION-STATUS).
-QString getStatusCaption(ProductionStatus status, bool isSalvageBay)
-{
-    switch (status)
-    {
-        case ProductionStatus::Unconfigured: return QObject::tr("no recipe");
-        case ProductionStatus::Producing:
-            return isSalvageBay ? QObject::tr("holding scrap")
-                                : QObject::tr("producing");
-        case ProductionStatus::Starved:
-            return isSalvageBay ? QObject::tr("empty") : QObject::tr("missing input");
-        case ProductionStatus::Blocked:      return QObject::tr("output full");
-    }
-    return QString();
-}
-
-// Every caption the status slot can end up showing for this building, so the header can
-// keep its width as the state changes rather than the panel jumping with it.
-QStringList getAllStatusCaptions(bool isSalvageBay)
-{
-    QStringList captions;
-    for (ProductionStatus status : { ProductionStatus::Unconfigured,
-                                     ProductionStatus::Producing,
-                                     ProductionStatus::Starved,
-                                     ProductionStatus::Blocked })
-    {
-        captions << getStatusCaption(status, isSalvageBay);
-    }
-    return captions;
-}
-
 }  // namespace
 
 
@@ -200,26 +168,25 @@ void SelectionContent::setProductionStatusSlot(const Building& building)
         return;
     }
 
-    const bool isSalvageBay = (building.type == BuildingType::SalvageBay);
-    // Room for every caption this building can show, so the panel keeps its width as the
-    // building's state changes rather than jumping with it.
-    reserveSlotFor(getAllStatusCaptions(isSalvageBay));
-
     const StatusLightVisuals& colors = m_context.visuals->statusLight;
-    QColor dotColor;
+    // The Salvage Bay has no recipe and no cycle: its two states say whether it is
+    // holding scrap, not whether it is producing (REQ-BLD-SALVAGE-BAY).
+    const bool isSalvageBay = (building.type == BuildingType::SalvageBay);
     switch (*status)
     {
-        case ProductionStatus::Unconfigured: dotColor = colors.grey;   break;
+        case ProductionStatus::Unconfigured:
-        case ProductionStatus::Producing:    dotColor = colors.green;  break;
+            setSlot(colors.grey, tr("no recipe"));
-        case ProductionStatus::Starved:      dotColor = colors.red;    break;
+            break;
-        case ProductionStatus::Blocked:      dotColor = colors.yellow; break;
+        case ProductionStatus::Producing:
+            setSlot(colors.green, isSalvageBay ? tr("holding scrap") : tr("producing"));
+            break;
+        case ProductionStatus::Starved:
+            setSlot(colors.red, isSalvageBay ? tr("empty") : tr("missing input"));
+            break;
+        case ProductionStatus::Blocked:
+            setSlot(colors.yellow, tr("output full"));
+            break;
     }
-    setSlot(dotColor, getStatusCaption(*status, isSalvageBay));
-}
-
-void SelectionContent::reserveSlotFor(const QStringList& captions)
-{
-    m_statusPill->reserveFor(captions);
 }
 
 void SelectionContent::refreshConstruction()

src/ui/selection/SelectionContent.h

@@ -5,7 +5,6 @@
 #include <QColor>
 #include <QPixmap>
 #include <QString>
-#include <QStringList>
 #include <QWidget>
 
 #include "BuildingId.h"
@@ -80,11 +79,6 @@ protected:
     void setCountSlot(int count);
     void clearSlot();
 
-    // Reserves header room for the widest caption the slot will ever show. The panel is
-    // sized to its card (REQ-UI-SELECTION-PANEL), so without this it changes width every
-    // time the caption does -- and a card whose chips wrap changes height with it.
-    void reserveSlotFor(const QStringList& captions);
-
     // Fills the right slot from the building's production status, mapped to the same
     // colors and states the world's status light uses (REQ-UI-SELECTION-STATUS). Leaves
     // the slot empty for a type that has no status light.

src/ui/selection/SelectionNames.cpp

@@ -33,16 +33,3 @@ QString getBehaviorLabel(BehaviorKind kind)
     }
     return QString();
 }
-
-QStringList getAllBehaviorLabels()
-{
-    QStringList labels;
-    for (BehaviorKind kind : { BehaviorKind::Retreat, BehaviorKind::Attack,
-                               BehaviorKind::SalvageScrap, BehaviorKind::Repair,
-                               BehaviorKind::Rally, BehaviorKind::Standby,
-                               BehaviorKind::Advance })
-    {
-        labels << getBehaviorLabel(kind);
-    }
-    return labels;
-}

src/ui/selection/SelectionNames.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <QString>
-#include <QStringList>
 
 #include "BehaviorKind.h"
 #include "BuildingType.h"
@@ -14,8 +13,3 @@ QString getBuildingTypeName(BuildingType type);
 // Name of the behavior currently governing a ship, for the ship card's header slot
 // (REQ-UI-SHIP-BEHAVIOR). Empty when no behavior has won yet, which shows no slot.
 QString getBehaviorLabel(BehaviorKind kind);
-
-// Every name getBehaviorLabel can return. A ship's behavior changes as it fights, so the
-// header reserves room for the widest of these rather than letting the panel change
-// width each time (REQ-UI-SELECTION-PANEL).
-QStringList getAllBehaviorLabels();

src/ui/selection/ShipContent.cpp

@@ -21,10 +21,6 @@ ShipContent::ShipContent(const SelectionContext& context,
     m_statsPanel = new ShipStatsPanel(context.config, this);
     getRuntimeLayout()->addWidget(m_statsPanel);
 
-    // A ship's behavior changes as it fights, so the header holds room for the longest
-    // name rather than the panel resizing under the player each time it does.
-    reserveSlotFor(getAllBehaviorLabels());
-
     EntityAdmin& admin = context.sim->getAdmin();
     if (admin.isValid(m_entity) && admin.hasAll<ShipIdentityComponent>(m_entity))
     {

src/ui/selection/StatusPill.cpp

@@ -1,6 +1,5 @@
 #include "StatusPill.h"
 
-#include <QFontMetrics>
 #include <QGuiApplication>
 #include <QHBoxLayout>
 #include <QLabel>
@@ -50,23 +49,6 @@ StatusPill::StatusPill(QWidget* parent)
     hide();
 }
 
-void StatusPill::reserveFor(const QStringList& captions)
-{
-    if (captions == m_reservedFor)
-    {
-        return;
-    }
-    m_reservedFor = captions;
-
-    const QFontMetrics metrics(m_captionLabel->font());
-    int widestPx = 0;
-    for (const QString& caption : captions)
-    {
-        widestPx = qMax(widestPx, metrics.horizontalAdvance(caption));
-    }
-    m_captionLabel->setMinimumWidth(widestPx);
-}
-
 void StatusPill::setStatus(const QColor& dotColor, const QColor& outlineColor,
                            const QString& caption)
 {

src/ui/selection/StatusPill.h

@@ -2,7 +2,6 @@
 
 #include <QColor>
 #include <QString>
-#include <QStringList>
 #include <QWidget>
 
 class QLabel;
@@ -24,16 +23,7 @@ public:
     void setStatus(const QColor& dotColor, const QColor& outlineColor,
                    const QString& caption);
 
-    // Reserves room for the widest of the captions this pill can show, so the header --
-    // and with it the panel, which is sized to its content (REQ-UI-SELECTION-PANEL) --
-    // keeps its width as the caption changes. Without it the whole panel jumps every
-    // time a building's status does, and a card whose chips wrap changes height with it.
-    void reserveFor(const QStringList& captions);
-
 private:
     QLabel* m_dotLabel;
     QLabel* m_captionLabel;
-    // What the width is currently reserved for, so re-reserving the same set on every
-    // refresh costs nothing.
-    QStringList m_reservedFor;
 };