уэээ

AdventureTimeSS14 · Dec 15, 2024 · 6d62222 · 6d62222
1 parent eedbaa2
commit 6d62222
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/Content.Client/ADT/Research/UI/ResearchConsoleMenu.xaml b/Content.Client/ADT/Research/UI/ResearchConsoleMenu.xaml
@@ -56,6 +56,12 @@
                     <Button Name="RecenterButton" Text="{Loc 'research-console-menu-recenter-button'}" MinHeight="40" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="5 5"/>
                 </PanelContainer>
             </BoxContainer>
+            <BoxContainer Name="InfoContainer"
+                Orientation="Vertical"
+                VerticalExpand="True"
+                HorizontalExpand="True"
+                SizeFlagsStretchRatio="2"
+                Margin="0 0 10 10"/>
         </BoxContainer>
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/ADT/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/ADT/Research/UI/ResearchConsoleMenu.xaml.cs
@@ -92,6 +92,7 @@ public void UpdatePanels(ResearchConsoleBoundInterfaceState state)
 
                 CurrentDiscipline = proto.ID;
                 discipline.SetClickPressed(false);
+                UpdatePanels(state);
                 Recenter();
             };
         }
@@ -220,7 +221,7 @@ public void Select(TechnologyPrototype proto)
         if (!_player.LocalEntity.HasValue)
             return;
 
-        var control = new TechnologyCardControl(proto, _prototype, _sprite, new(), Points, _accessReader.IsAllowed(_player.LocalEntity.Value, Entity) && List.Contains(proto.ID));
+        var control = new TechnologyInfoPanel(proto, _sprite, Points, _accessReader.IsAllowed(_player.LocalEntity.Value, Entity) && List.Contains(proto.ID));
         InfoContainer.AddChild(control);
     }
 

diff --git a/Content.Client/ADT/Research/UI/TechnologyInfoPanel.xaml b/Content.Client/ADT/Research/UI/TechnologyInfoPanel.xaml
@@ -1,12 +1,14 @@
 <Control xmlns="https://spacestation14.io"
     xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    Margin="5">
+    Margin="5"
+    Orientation="Vertical"
+    VerticalExpand="True">
     <BoxContainer
         Name="InfoContainer"
         Orientation="Vertical"
         VerticalExpand="True"
-        VerticalAlignment="Top">
+        Margin="5">
         <TextureRect Name="TechnologyTexture"
                      TextureScale="2 2"
                      VerticalAlignment="Center"
@@ -17,11 +19,14 @@
         </BoxContainer>
         <Button Name="ResearchButton" Text="{Loc 'research-console-menu-server-research-button'}" HorizontalAlignment="Left"/>
     </BoxContainer>
+    <Control MinSize="10 10"
+        HorizontalExpand="True"/>
     <BoxContainer
         Name="RecipesContainer"
         Orientation="Vertical"
         VerticalExpand="True"
-        VerticalAlignment="Bottom">
+        VerticalAlignment="Bottom"
+        Margin="5">
         <Label Text="{Loc 'research-console-unlocked-text'}" HorizontalAlignment="Center"/>
         <customControls:HSeparator StyleClasses="LowDivider" Margin="0 0 0 10"/>
         <PanelContainer VerticalExpand="True">