Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Next adaptation
Browse files Browse the repository at this point in the history
FireNameFN committed Nov 9, 2024
1 parent b62c91f commit 4db8eaf
Showing 6 changed files with 5 additions and 7 deletions.
1 change: 1 addition & 0 deletions Content.Client/Options/UI/OptionsTabControlRow.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Linq;
using Content.Client._CorvaxNext.Options.UI;
using Content.Client.Stylesheets;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;
5 changes: 3 additions & 2 deletions Content.Client/Options/UI/Tabs/AccessibilityTab.xaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Control xmlns="https://spacestation14.io"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ui="clr-namespace:Content.Client.Options.UI">
xmlns:ui="clr-namespace:Content.Client.Options.UI"
xmlns:cnui="clr-namespace:Content.Client._CorvaxNext.Options.UI">
<BoxContainer Orientation="Vertical">
<ScrollContainer VerticalExpand="True" HScrollEnabled="False">
<BoxContainer Orientation="Vertical" Margin="8">
@@ -11,7 +12,7 @@
<ui:OptionSlider Name="ScreenShakeIntensitySlider" Title="{Loc 'ui-options-screen-shake-intensity'}" />
<!-- Corvax-Highlights-Start -->
<CheckBox Name="AutoFillHighlightsCheckBox" Text="{Loc 'ui-options-auto-fill-highlights'}" />
<ui:OptionColorSlider Name="HighlightsColorSlider"
<cnui:OptionColorSlider Name="HighlightsColorSlider"
Title="{Loc 'ui-options-highlights-color'}"
Example="{Loc 'ui-options-highlights-color-example'}"/>
<!-- Corvax-Highlights-End -->
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<!-- Corvax-Highlights-Start -->
<Control xmlns="https://spacestation14.io">
<BoxContainer Orientation="Vertical">
<Label Name="TitleLabel" Access="Public" />
<Label Name="ExampleLabel" Access="Public" />
<ColorSelectorSliders Name="Slider" Access="Public" HorizontalExpand="True" />
</BoxContainer>
</Control>
<!-- Corvax-Highlights-End -->
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// Corvax-Highlights-Start
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;

namespace Content.Client.Options.UI;
namespace Content.Client._CorvaxNext.Options.UI;

/// <summary>
/// Standard UI control used for color sliders in the options menu. Intended for use with <see cref="OptionsTabControlRow"/>.
@@ -29,4 +28,3 @@ public string? Example
set => ExampleLabel.Text = value;
}
}
// Corvax-Highlights-End
File renamed without changes.
File renamed without changes.

0 comments on commit 4db8eaf

Please sign in to comment.