Change fix for invisible labels on linux

gui/builtinStatsViews/resourcesViewFull.py

@@ -278,16 +278,14 @@ class ResourcesViewFull(StatsView):
                 totalCalibrationPoints = value
                 labelTCP = label
 
-            # See #1877
-            shown = label.Shown
-            label.Show(True)
             if isinstance(value, str):
                 label.SetLabel(value)
                 label.SetToolTip(wx.ToolTip(value))
             else:
                 label.SetLabel(formatAmount(value, prec, lowest, highest))
                 label.SetToolTip(wx.ToolTip("%.1f" % value))
-            label.Show(shown)
+            # See issue #1877
+            label.InvalidateBestSize()
 
         colorWarn = wx.Colour(204, 51, 51)
         colorNormal = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)

gui/fitCommands/guiRebaseItems.py

@@ -33,6 +33,8 @@ class GuiRebaseItemsCommand(wx.Command):
             for obj in container:
                 if obj.itemID in self.rebaseMap:
                     self.internal_history.Submit(FitRebaseItemCommand(self.fitID, containerName, container.index(obj), self.rebaseMap[obj.itemID]))
+        # Need to process cargo separately as we want to merge items when needed,
+        # e.g. FN iron and CN iron into single stack of CN iron
         for cargo in fit.cargo:
             if cargo.itemID in self.rebaseMap:
                 amount = cargo.amount