Skip to content

Commit 3670c7b

Browse files
committed
adjust menu item width
1 parent 5da8594 commit 3670c7b

9 files changed

+85
-35
lines changed

Dialog/Fonts/chinese.fnt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<info face="Noto Sans CJK SC Medium" size="64" bold="0" italic="0" charset="" unicode="1" stretchH="100" smooth="1" aa="4" padding="0,0,0,0" spacing="1,1" outline="0"/>
44
<common lineHeight="64" base="51" scaleW="256" scaleH="256" pages="2" packed="0" alphaChnl="0" redChnl="4" greenChnl="4" blueChnl="4"/>
55
<pages>
6-
<page id="0" file="chinese_generated_1712832684431_0.png" />
7-
<page id="1" file="chinese_generated_1712832684431_1.png" />
6+
<page id="0" file="chinese_generated_1718818868041_0.png" />
7+
<page id="1" file="chinese_generated_1718818868041_1.png" />
88
</pages>
99
<chars count="48">
1010
<char id="19977" x="201" y="40" width="38" height="33" xoffset="3" yoffset="18" xadvance="43" page="1" chnl="15" />

Source/Module/Menu/CustomColors.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public static void AddItemWithDescriptionAndCMD(TextMenu menu, List<TextMenu.Ite
226226
internal static List<TextMenu.Item> Create_PageOnOff(TextMenu menu, bool inGame) {
227227
List<TextMenu.Item> page = new List<TextMenu.Item>();
228228
page.Add(new TextMenu.OnOff("Show Cycle Hitbox Colors".ToDialogText(), TasHelperSettings.ShowCycleHitboxColors).Change(value => TasHelperSettings.ShowCycleHitboxColors = value));
229-
TextMenu.Item NotInViewColorItem = new EnumerableSlider<UsingNotInViewColorModes>("Using NotInView Color Modes".ToDialogText(), TASHelperMenu.CreateUsingNotInViewColorOptions(),
229+
TextMenu.Item NotInViewColorItem = new EnumerableSliderExt<UsingNotInViewColorModes>("Using NotInView Color Modes".ToDialogText(), TASHelperMenu.CreateUsingNotInViewColorOptions(),
230230
TasHelperSettings.UsingNotInViewColorMode).Change(value => TasHelperSettings.UsingNotInViewColorMode = value);
231231
page.Add(NotInViewColorItem);
232232
page.AddDescriptionOnEnter(menu, NotInViewColorItem, "Using NotInView Color Description".ToDialogText());

Source/Module/Menu/MoreOptionsMenu.cs

+7-8
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ private static void AddDescriptionOnEnter(this List<TextMenu.Item> page, TextMen
1717
internal static List<TextMenu.Item> Create_Page1(TextMenu menu) {
1818
List<TextMenu.Item> page = new List<TextMenu.Item>();
1919
page.Add(new TextMenu.OnOff("Spawn Point".ToDialogText(), TasHelperSettings.UsingSpawnPoint).Change((value) => TasHelperSettings.UsingSpawnPoint = value));
20-
page.Add(new TextMenuExt.IntSlider("Current Spawn Point Opacity".ToDialogText(), 1, 9, TasHelperSettings.CurrentSpawnPointOpacity).Change((value) => TasHelperSettings.CurrentSpawnPointOpacity = value));
21-
page.Add(new TextMenuExt.IntSlider("Other Spawn Point Opacity".ToDialogText(), 0, 9, TasHelperSettings.OtherSpawnPointOpacity).Change((value) => TasHelperSettings.OtherSpawnPointOpacity = value));
20+
page.Add(new IntSliderExt("Current Spawn Point Opacity".ToDialogText(), 1, 9, TasHelperSettings.CurrentSpawnPointOpacity).Change((value) => TasHelperSettings.CurrentSpawnPointOpacity = value));
21+
page.Add(new IntSliderExt("Other Spawn Point Opacity".ToDialogText(), 0, 9, TasHelperSettings.OtherSpawnPointOpacity).Change((value) => TasHelperSettings.OtherSpawnPointOpacity = value));
2222
page.Add(new HLine(Color.Gray));
2323
TextMenu.Item moaItem;
2424
page.Add(moaItem = new TextMenu.OnOff("Movement Overshoot Assistant".ToDialogText(), TasHelperSettings.EnableMovementOvershootAssistant).Change((value) => TasHelperSettings.EnableMovementOvershootAssistant = value));
@@ -32,22 +32,21 @@ private static void AddDescriptionOnEnter(this List<TextMenu.Item> page, TextMen
3232
TasHelperSettings.CassetteBlockHelperShowExtraInfo = value;
3333
CassetteBlockHelper.CassetteBlockVisualizer.needReAlignment = true;
3434
}));
35-
page.Add(new TextMenuExt.EnumerableSlider<CassetteBlockHelper.Alignments>("Cassette Info Alignment".ToDialogText(),
35+
page.Add(new EnumerableSliderExt<CassetteBlockHelper.Alignments>("Cassette Info Alignment".ToDialogText(),
3636
CreateCassetteBlockHelperAlignmentsOptions(), TasHelperSettings.CassetteBlockInfoAlignment).Change(value => TasHelperSettings.CassetteBlockInfoAlignment = value));
3737
page.Add(new HLine(Color.Gray));
3838
page.Add(new TextMenu.OnOff("Enable Pixel Grid".ToDialogText(), TasHelperSettings.EnablePixelGrid).Change(value => TasHelperSettings.EnablePixelGrid = value));
39-
page.Add(new TextMenuExt.IntSlider("Pixel Grid Width".ToDialogText(), 0, 50, TasHelperSettings.PixelGridWidth).Change(value => TasHelperSettings.PixelGridWidth = value));
40-
page.Add(new TextMenuExt.IntSlider("Pixel Grid Opacity".ToDialogText(), 1, 10, TasHelperSettings.PixelGridOpacity).Change(value => TasHelperSettings.PixelGridOpacity = value));
39+
page.Add(new IntSliderExt("Pixel Grid Width".ToDialogText(), 0, 50, TasHelperSettings.PixelGridWidth).Change(value => TasHelperSettings.PixelGridWidth = value));
40+
page.Add(new IntSliderExt("Pixel Grid Opacity".ToDialogText(), 1, 10, TasHelperSettings.PixelGridOpacity).Change(value => TasHelperSettings.PixelGridOpacity = value));
4141
page.Add(new HLine(Color.Gray));
4242
return page;
4343
}
4444

4545

4646
internal static List<TextMenu.Item> Create_Page2(TextMenu menu) {
4747
List<TextMenu.Item> page = new List<TextMenu.Item>();
48-
4948
page.Add(new TextMenu.OnOff("Camera Target".ToDialogText(), TasHelperSettings.UsingCameraTarget).Change(value => TasHelperSettings.UsingCameraTarget = value));
50-
page.Add(new TextMenuExt.IntSlider("Camera Target Vector Opacity".ToDialogText(), 1, 9, TasHelperSettings.CameraTargetLinkOpacity).Change(value => TasHelperSettings.CameraTargetLinkOpacity = value));
49+
page.Add(new IntSliderExt("Camera Target Vector Opacity".ToDialogText(), 1, 9, TasHelperSettings.CameraTargetLinkOpacity).Change(value => TasHelperSettings.CameraTargetLinkOpacity = value));
5150
page.Add(new HLine(Color.Gray));
5251
page.Add(new TextMenu.OnOff("FireBall Track".ToDialogText(), TasHelperSettings.UsingFireBallTrack).Change(value => TasHelperSettings.UsingFireBallTrack = value));
5352
page.Add(new TextMenu.OnOff("RotateSpinner Track".ToDialogText(), TasHelperSettings.UsingRotateSpinnerTrack).Change(value => TasHelperSettings.UsingRotateSpinnerTrack = value));
@@ -74,7 +73,7 @@ private static void AddDescriptionOnEnter(this List<TextMenu.Item> page, TextMen
7473
BetterInvincible.Invincible = false; // in case that value doesn't get reset for some unknown reason... yeah i have such bug report
7574
}));
7675
page.AddDescriptionOnEnter(menu, betterInvincible, "Better Invincible Description".ToDialogText());
77-
page.Add(new TextMenuExt.IntSlider("SpeedrunTimer Opacity when TAS Pauses".ToDialogText(), 1, 10, TasHelperSettings.SpeedrunTimerDisplayOpacity).Change(value => TasHelperSettings.SpeedrunTimerDisplayOpacity = value));
76+
page.Add(new IntSliderExt("SpeedrunTimer Opacity when TAS Pauses".ToDialogText(), 1, 10, TasHelperSettings.SpeedrunTimerDisplayOpacity).Change(value => TasHelperSettings.SpeedrunTimerDisplayOpacity = value));
7877
page.Add(new HLine(Color.Gray));
7978
TextMenu.Item subscribeWhatsNew;
8079
page.Add(subscribeWhatsNew = new TextMenu.OnOff("Subscribe Whats New".ToDialogText(), TasHelperSettings.SubscribeWhatsNew).Change(value => TasHelperSettings.SubscribeWhatsNew = value));

Source/Module/Menu/OptionSubMenuExt.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,9 @@ public override void Render(Vector2 position, bool highlighted) {
476476
DrawIcon(vector2, icon, justify2, outline: true, obj * alpha, 0.8f);
477477
ActiveFont.DrawOutline(Label, vector2, justify, Vector2.One, color, 2f, strokeColor);
478478
if (Menus.Count > 0) {
479-
float num = RightWidth();
479+
string page_title = Menus[MenuIndex].Item1;
480+
float num = ActiveFont.Measure(page_title).X;
481+
num = num * 0.8f + 160f; // coz our scale is 0.8f
480482
ActiveFont.DrawOutline(Menus[MenuIndex].Item1, vector2 + new Vector2(Container.Width - num * 0.5f + lastDir * ValueWiggler.Value * 8f, 0f), new Vector2(0.5f, 0.5f), Vector2.One * 0.8f, color, 2f, strokeColor);
481483
Vector2 vector3 = Vector2.UnitX * (highlighted ? (float)Math.Sin(sine * 4f) * 4f : 0f);
482484
Color color2 = MenuIndex > 0 ? color : Color.DarkSlateGray * alpha;

Source/Module/Menu/PredictorMenu.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private static HLine CreateHLine(string text) {
4040
TextMenu.Item PredictItem;
4141
page.Add(PredictItem = new TextMenu.OnOff("Predictor Main Switch".ToDialogText(), TasHelperSettings.PredictFutureEnabled).Change((value) => TasHelperSettings.PredictFutureEnabled = value));
4242
page.AddDescriptionOnEnter(menu, PredictItem, "Predictor Description".ToDialogText());
43-
page.Add(new IntSlider("Timeline Length".ToDialogText(), 1, 999, TasHelperSettings.TimelineLength).Change((value) => {
43+
page.Add(new IntSliderExt("Timeline Length".ToDialogText(), 1, 999, TasHelperSettings.TimelineLength).Change((value) => {
4444
TasHelperSettings.TimelineLength = value;
4545
Predictor.PredictorCore.InitializeCachePeriod();
4646
}));
@@ -110,8 +110,8 @@ private static HLine CreateHLine(string text) {
110110
TextMenu.Item fadeoutItem;
111111
page.Add(fadeoutItem = new TextMenu.OnOff("Timeline FadeOut".ToDialogText(), TasHelperSettings.TimelineFadeOut).Change(value => TasHelperSettings.TimelineFadeOut = value));
112112
page.AddDescriptionOnEnter(menu, fadeoutItem, "Only Apply To Hitbox".ToDialogText());
113-
page.Add(new IntSlider("Predictor Line Width".ToDialogText(), 0, 20, TasHelperSettings.PredictorLineWidth).Change(value => TasHelperSettings.PredictorLineWidth = value));
114-
page.Add(new IntSlider("Predictor Point Size".ToDialogText(), 0, 20, TasHelperSettings.PredictorPointSize).Change(value => TasHelperSettings.PredictorPointSize = value));
113+
page.Add(new IntSliderExt("Predictor Line Width".ToDialogText(), 0, 20, TasHelperSettings.PredictorLineWidth).Change(value => TasHelperSettings.PredictorLineWidth = value));
114+
page.Add(new IntSliderExt("Predictor Point Size".ToDialogText(), 0, 20, TasHelperSettings.PredictorPointSize).Change(value => TasHelperSettings.PredictorPointSize = value));
115115
page.Add(CreateHLine());
116116
return page;
117117
}
@@ -136,7 +136,7 @@ private static HLine CreateHLine(string text) {
136136
TasHelperSettings.StopPredictWhenKeyframe = value;
137137
Predictor.PredictorCore.InitializeChecks();
138138
}));
139-
TextMenu.Item ultraSpeedItem = new IntSlider("Ultra Speed Lower Limit".ToDialogText(), 0, 325, TasHelperSettings.UltraSpeedLowerLimit).Change((value) => TasHelperSettings.UltraSpeedLowerLimit = value);
139+
TextMenu.Item ultraSpeedItem = new IntSliderExt("Ultra Speed Lower Limit".ToDialogText(), 0, 325, TasHelperSettings.UltraSpeedLowerLimit).Change((value) => TasHelperSettings.UltraSpeedLowerLimit = value);
140140
page.Add(ultraSpeedItem);
141141
page.AddDescriptionOnEnter(menu, ultraSpeedItem, "Ultra Speed Lower Limit Description".ToDialogText());
142142
page.Add(CreateHLine());

0 commit comments

Comments
 (0)