Skip to content

General Character Editor Improvements #2252

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

Merged
Timfa2112 merged 10 commits into from
Apr 24, 2025
Merged

General Character Editor Improvements #2252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1ab5841
add alternating background container
DEATHB4DEFEAT Apr 16, 2025
a925309
use ABGC on appearance and background tabs
DEATHB4DEFEAT Apr 16, 2025
b5527e9
use ABGC on jobs and antags, and remove odd margin on some tabs
DEATHB4DEFEAT Apr 18, 2025
d68861b
better marking editor
DEATHB4DEFEAT Apr 18, 2025
e6af096
better character editor layout, show all 4 directions on the preview
DEATHB4DEFEAT Apr 19, 2025
cd087fe
improve some button names for charedit
DEATHB4DEFEAT Apr 19, 2025
37e9fd9
Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…
DEATHB4DEFEAT Apr 19, 2025
6028c0d
huh
DEATHB4DEFEAT Apr 19, 2025
3e551e9
Merge branch 'master' into cooler-cooler-markings
VMSolidus Apr 21, 2025
03d510e
Merge branch 'master' into cooler-cooler-markings
DEATHB4DEFEAT Apr 24, 2025
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
46 changes: 19 additions & 27 deletions Content.Client/Humanoid/MarkingPicker.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,29 @@
<Control xmlns="https://spacestation14.io">
<Control xmlns="https://spacestation14.io"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
<!-- Primary container -->
<BoxContainer Orientation="Vertical" HorizontalExpand="True">
<!-- Marking lists -->
<BoxContainer Orientation="Horizontal" SeparationOverride="5" HorizontalExpand="True">
<!-- Unused markings -->
<BoxContainer Orientation="Vertical" HorizontalExpand="True">
<BoxContainer Orientation="Horizontal" HorizontalExpand="True">
<Label Text="{Loc 'markings-unused'}" HorizontalAlignment="Stretch" HorizontalExpand="True" />
<Label Name="CMarkingPoints" Text="uwu" HorizontalAlignment="Right" />
</BoxContainer>

<OptionButton Name="CMarkingCategoryButton" StyleClasses="OpenLeft" />
<LineEdit Name="CMarkingSearch" PlaceHolder="{Loc 'markings-search'}" />

<ItemList Name="CMarkingsUnused" VerticalExpand="True" MinSize="300 250" />
<Button Name="CMarkingAdd" Text="{Loc 'markings-add'}" StyleClasses="OpenRight" />
<!-- Markings -->
<BoxContainer Orientation="Vertical" HorizontalExpand="True">
<BoxContainer HorizontalExpand="True">
<OptionButton Name="CMarkingCategoryButton" StyleClasses="OpenBoth" />
<Label Name="CMarkingPoints" Text="uwu" />
<LineEdit Name="CMarkingSearch" PlaceHolder="{Loc 'markings-search'}" Margin="8 0 0 0" HorizontalExpand="True" />
<Button Name="ResetButton" Text="{Loc 'ui-options-bind-reset'}" StyleClasses="OpenLeft" />
</BoxContainer>

<!-- Used markings -->
<BoxContainer Orientation="Vertical" HorizontalExpand="True">
<Label Text="{Loc 'markings-used'}" />
<PanelContainer>
<PanelContainer.PanelOverride>
<graphics:StyleBoxFlat BackgroundColor="#1B1B1E" />
</PanelContainer.PanelOverride>

<ItemList Name="CMarkingsUsed" VerticalExpand="True" MinSize="300 250" />

<BoxContainer Orientation="Horizontal">
<Button Name="CMarkingRankUp" Text="{Loc 'markings-rank-up'}" StyleClasses="OpenBoth" HorizontalExpand="True" />
<Button Name="CMarkingRankDown" Text="{Loc 'markings-rank-down'}" StyleClasses="OpenBoth" HorizontalExpand="True" />
</BoxContainer>
<Button Name="CMarkingRemove" Text="{Loc 'markings-remove'}" StyleClasses="OpenRight" />
</BoxContainer>
<ScrollContainer HorizontalExpand="True" MinSize="300 300">
<BoxContainer Name="Markings" Orientation="Vertical" HorizontalExpand="True" MinSize="300 300" />
</ScrollContainer>
</PanelContainer>
</BoxContainer>

<!-- Colors -->
<BoxContainer Name="CMarkingColors" Orientation="Vertical" Visible="False" />
<BoxContainer Name="CMarkingColors" Margin="0 4 0 0" Orientation="Vertical" Visible="False" />
</BoxContainer>
</Control>
Loading
Loading