Skip to content
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

[UI] Fix accelerator control #460

Merged
merged 3 commits into from
Sep 11, 2024
Merged

[UI] Fix accelerator control #460

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
9b58def
фикс UI УЧ
Schrodinger71 Sep 11, 2024
2ff5da8
Убрааал 2 проблела
Schrodinger71 Sep 11, 2024
42e3996
Merge branch 'master' into fix_accelerator_control
Schrodinger71 Sep 11, 2024
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
2 changes: 0 additions & 2 deletions Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,11 @@
<SplitContainer Orientation="Vertical"
HorizontalExpand="True"
VerticalExpand="True">

<ScrollContainer HScrollEnabled="False"
HorizontalExpand="True"
VerticalExpand="True"
MinHeight="50"
SizeFlagsStretchRatio="2.5">

<GridContainer Name="ReagentList"
HorizontalExpand="True"
VerticalExpand="True"
Expand Down
4 changes: 2 additions & 2 deletions Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
xmlns:ui="clr-namespace:Content.Client.ParticleAccelerator.UI"
xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
Title="{Loc 'particle-accelerator-control-menu-device-version-label'}"
MinSize="420 320"
SetSize="420 320">
MinSize="840 640"
SetSize="840 640"> <!-- ADT-Tweak: Соотношение увеличено в 2 раза -->
<BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="0 10 0 0">
<BoxContainer Orientation="Horizontal" VerticalExpand="True">
<BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="10 0 10 5">
Expand Down
Loading