Merge remote-tracking branch 'origin/DevBranch' into DevBranch

Pulsar4xDevs · May 11, 2024 · 5fafa3f · 5fafa3f
2 parents 31c4ebc + bb002e4
commit 5fafa3f
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/Pulsar4X/Pulsar4X.Client/EmpireManagement/Selector.cs b/Pulsar4X/Pulsar4X.Client/EmpireManagement/Selector.cs
@@ -82,24 +82,32 @@ internal override void Display()
                             FleetWindow.GetInstance().SetActive(true);
                             FleetWindow.GetInstance().SelectFleet(fleet);
                         }
+
                         if (ImGui.IsItemHovered())
                         {
-                            ImGui.BeginTooltip();
-
-                            if(fleet.TryGetDatablob<OrderableDB>(out var orderableDb)
-                            && orderableDb.ActionList.Count > 0)
+                            void Callback()
                             {
-                                ImGui.Text("Orders:");
-                                for(int i = 0; i < orderableDb.ActionList.Count; i++)
+                                if(fleet.TryGetDatablob<OrderableDB>(out var orderableDb)
+                                && orderableDb.ActionList.Count > 0)
                                 {
-                                    ImGui.Text(orderableDb.ActionList[i].Name);
+                                    ImGui.Text("Orders:");
+                                    for(int i = 0; i < orderableDb.ActionList.Count; i++)
+                                    {
+                                        ImGui.Text(orderableDb.ActionList[i].Name);
+                                    }
+                                }
+                                else
+                                {
+                                    ImGui.Text("No orders");
                                 }
                             }
-                            else
+
+                            var flagshipID = fleet.GetDataBlob<FleetDB>().FlagShipID;
+                            if(fleet.Manager?.TryGetEntityById(flagshipID, out var flagship) ?? false)
                             {
-                                ImGui.Text("No orders");
+                                var positionDB = flagship.GetDataBlob<PositionDB>();
+                                DisplayHelpers.DescriptiveTooltip(display, positionDB.Parent?.GetName(_uiState.Faction.Id) ?? "Unknown", "", Callback);
                             }
-                            ImGui.EndTooltip();
                         }
                     }
                 }