Skip to content

RND UI #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Pcolik505 wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

RND UI #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
488d714
Кто-то забыл про комментарии в прототипах
Pcolik505 Aug 4, 2026
0eb668e
Fix1
Pcolik505 Aug 4, 2026
06a6b73
Fix2
Pcolik505 Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Content.Client/_Goobstation/Research/UI/FancyResearchConsoleItem.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
xmlns:goob="clr-namespace:Content.Client._Goobstation.Research.UI"
Margin="4"
HorizontalExpand="False"> <!-- Frontier: Margin="5" < Margin="4" -->
<BoxContainer Orientation="Vertical" SetSize="64 64"> <!-- Frontier: "80 80" < "64 64" -->
Margin="6"
HorizontalExpand="False"> <!-- Frontier: Margin="5" < Margin="4" --> <!-- LuaM: Margin="4" > Margin="6" -->
<BoxContainer Orientation="Vertical" SetSize="51 51"> <!-- Frontier: "80 80" < "64 64" --> <!-- LuaM: "64 64" > "51 51" -->
<PanelContainer VerticalExpand="True"
HorizontalExpand="True"
Name="Panel">
Expand All @@ -13,10 +13,10 @@
ModulateSelfOverride="#00000000"
HorizontalExpand="True"/>
<EntityPrototypeView
Name="ResearchDisplay"
Scale="1.75 1.75"
SetSize="56 56">
</EntityPrototypeView> <!-- Frontier: "2" < "1.75", "64 64" < "56 56" -->
Name="ResearchDisplay"
Scale="1.42 1.42"
SetSize="46 46">
</EntityPrototypeView> <!-- Frontier: "2" < "1.75", "64 64" < "56 56" --> <!-- LuaM: "1.75" 1.75" > "1.42 1.42", "64 64" > "46 46" -->
</PanelContainer>
</BoxContainer>
</LayoutContainer>
</LayoutContainer>
52 changes: 43 additions & 9 deletions Content.Client/_Goobstation/Research/UI/FancyResearchConsoleMenu.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<controls:FancyWindow xmlns="https://spacestation14.io"
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls;assembly=Content.Client"
xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls;assembly=Content.Client"
xmlns:goob="clr-namespace:Content.Client._Goobstation.Research.UI"
Title="{Loc 'research-console-menu-title'}"
SetSize="1260 850"
MinSize="600 400"> <!-- Frontier: add MinSize-->
SetSize="1450 1025"
MinSize="600 400"> <!-- Frontier: add MinSize--> <!-- LuaM: SetSize= "1260 850" > "1450 1025"-->
<BoxContainer Orientation="Vertical"
HorizontalExpand="True"
VerticalExpand="True">
Expand All @@ -24,9 +23,37 @@
<Button Name="ServerButton" Text="{Loc 'research-console-menu-server-selection-button'}" MinHeight="40"/>
</BoxContainer>
</BoxContainer>
<BoxContainer Orientation="Horizontal"
<!-- LuaM-start:-->
<PanelContainer Name="DisciplineSelectionScreen"
VerticalExpand="True"
HorizontalExpand="True"
Visible="True">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#222226FF" />
</PanelContainer.PanelOverride>
<ScrollContainer HScrollEnabled="False"
HorizontalExpand="True"
VerticalExpand="True">
<BoxContainer Orientation="Vertical"
HorizontalExpand="True"
VerticalExpand="True">
<Control VerticalExpand="True" MinHeight="180"/>
<GridContainer Name="DisciplineGrid"
Columns="3"
HorizontalAlignment="Center"
HorizontalExpand="True"
Margin="20">
</GridContainer>
<Control VerticalExpand="True"/>
</BoxContainer>
</ScrollContainer>
</PanelContainer>
<BoxContainer Name="ResearchFieldScreen"
Orientation="Horizontal"
HorizontalExpand="True"
VerticalExpand="True">
VerticalExpand="True"
Visible="False">
<!-- LuaM-end:-->
<BoxContainer Orientation="Vertical"
VerticalExpand="True"
HorizontalExpand="True"
Expand All @@ -36,15 +63,22 @@
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#222226FF" />
</PanelContainer.PanelOverride>
<!-- LuaM-start:-->
<Button Name="BackToDisciplinesButton"
Text="{Loc 'research-console-menu-back-button'}"
MinHeight="40"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Margin="5 5"/>
<!-- LuaM-end:-->
<goob:ResearchesContainerPanel
HorizontalExpand="True"
VerticalExpand="True"
Name="DragContainer"
MouseFilter="Pass"
RectClipContent="True">
<!-- There lives all of technologies -->
<!-- There lives all of technologies -->
</goob:ResearchesContainerPanel>
<Button Name="RecenterButton" Text="{Loc 'research-console-menu-recenter-button'}" MinHeight="40" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="5 -5"/>
</PanelContainer>
</BoxContainer>
<PanelContainer SizeFlagsStretchRatio="2">
Expand All @@ -57,7 +91,7 @@
HorizontalExpand="True"
SizeFlagsStretchRatio="1"
Margin="0">
<!-- Frontier: add a placeholder so the scrollable interface doesn't immediately shrink, matches InfoPanel size -->
<!-- Frontier: add a placeholder so the scrollable interface doesn't immediately shrink, matches InfoPanel size -->
<Control
Margin="5"
MinWidth="450"
Expand All @@ -67,4 +101,4 @@
</PanelContainer>
</BoxContainer>
</BoxContainer>
</controls:FancyWindow>
</controls:FancyWindow>
Loading
Loading