Skip to content
This repository was archived by the owner on Jan 24, 2023. It is now read-only.

Commit f1b459e

Browse files
imxLucidimxLucid
committed
Yeet
1 parent 5fb606e commit f1b459e

6 files changed

Lines changed: 8 additions & 112 deletions

File tree

‎UI/QuickMenu/IButtonPage.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ public interface IButtonPage
88
ReMenuButton AddButton(string text, string tooltip, Action onClick, Sprite sprite = null);
99
ReMenuToggle AddToggle(string text, string tooltip, Action<bool> onToggle, bool defaultValue = false);
1010
ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue);
11-
ReMenuSlider AddSlider(string text, string tooltip, Action<float> onSlide, float defaultValue = 0, float minValue = 0, float maxValue = 10);
12-
ReMenuSlider AddSlider(string text, string tooltip, ConfigValue<float> configValue, float defaultValue = 0, float minValue = 0, float maxValue = 10);
1311
ReMenuPage AddMenuPage(string text, string tooltip = "", Sprite sprite = null);
1412
ReCategoryPage AddCategoryPage(string text, string tooltip = "", Sprite sprite = null);
1513
ReMenuPage GetMenuPage(string name);

‎UI/QuickMenu/ReCategoryPage.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public ReCategoryPage(string text, bool isRoot = false) : base(MenuPrefab, Quick
5252
Object.DestroyImmediate(GameObject.GetComponent<LaunchPadQMMenu>());
5353

5454
RectTransform.SetSiblingIndex(SiblingIndex);
55-
55+
5656
_isRoot = isRoot;
5757
var headerTransform = RectTransform.GetChild(0);
5858
Object.DestroyImmediate(headerTransform.Find("RightItemContainer/Button_QM_Expand").gameObject);
@@ -163,11 +163,11 @@ private static void FixLaunchpadScrolling()
163163
{
164164
var dashboard = QuickMenuEx.Instance.field_Public_Transform_0.Find("Window/QMParent/Menu_Dashboard").GetComponent<UIPage>();
165165
var scrollRect = dashboard.GetComponentInChildren<ScrollRect>();
166-
166+
167167
scrollRect.content.GetComponent<VerticalLayoutGroup>().childControlHeight = true;
168168
scrollRect.enabled = true;
169169
scrollRect.verticalScrollbar = scrollRect.transform.Find("Scrollbar").GetComponent<Scrollbar>(); ;
170170
scrollRect.viewport.GetComponent<RectMask2D>().enabled = true;
171171
}
172172
}
173-
}
173+
}

‎UI/QuickMenu/ReMenuCategory.cs‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public ReMenuHeader(Transform transform) : base(transform)
4747
}
4848

4949
protected ReMenuHeader(GameObject original, Transform parent, Vector3 pos, string name, bool defaultState = true) : base(original, parent, pos, name, defaultState) { }
50-
protected ReMenuHeader(GameObject original, Transform parent, string name, bool defaultState = true) : base(original, parent, name, defaultState){}
50+
protected ReMenuHeader(GameObject original, Transform parent, string name, bool defaultState = true) : base(original, parent, name, defaultState) { }
5151
}
5252

5353
public class ReMenuHeaderCollapsible : ReMenuHeader
@@ -190,18 +190,6 @@ public ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> con
190190
return toggle;
191191
}
192192

193-
public ReMenuSlider AddSlider(string text, string tooltip, Action<float> onSlide, float defaultValue = 0, float minValue = 0, float maxValue = 10)
194-
{
195-
var slider = new ReMenuSlider(text, tooltip, onSlide, _buttonContainer.RectTransform, defaultValue, minValue, maxValue);
196-
return slider;
197-
}
198-
199-
public ReMenuSlider AddSlider(string text, string tooltip, ConfigValue<float> configValue, float defaultValue = 0, float minValue = 0, float maxValue = 10)
200-
{
201-
var slider = new ReMenuSlider(text, tooltip, configValue.SetValue, _buttonContainer.RectTransform, configValue, minValue, maxValue);
202-
return slider;
203-
}
204-
205193
public ReMenuPage AddMenuPage(string text, string tooltip = "", Sprite sprite = null)
206194
{
207195
var existingPage = GetMenuPage(text);
@@ -242,4 +230,4 @@ public ReCategoryPage GetCategoryPage(string name)
242230
return transform == null ? null : new ReCategoryPage(transform);
243231
}
244232
}
245-
}
233+
}

‎UI/QuickMenu/ReMenuPage.cs‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public ReMenuPage(string text, bool isRoot = false) : base(MenuPrefab, QuickMenu
7878
// Get scroll stuff
7979
var scrollRect = RectTransform.Find("Scrollrect").GetComponent<ScrollRect>();
8080
_container = scrollRect.content;
81-
81+
8282
// copy properties of old grid layout
8383
var gridLayoutGroup = _container.Find("Buttons").GetComponent<GridLayoutGroup>();
8484

@@ -162,18 +162,6 @@ public ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> con
162162
return new ReMenuToggle(text, tooltip, configValue.SetValue, _container, configValue);
163163
}
164164

165-
public ReMenuSlider AddSlider(string text, string tooltip, Action<float> onSlide, float defaultValue = 0, float minValue = 0, float maxValue = 10)
166-
{
167-
var slider = new ReMenuSlider(text, tooltip, onSlide, _container, defaultValue, minValue, maxValue);
168-
return slider;
169-
}
170-
171-
public ReMenuSlider AddSlider(string text, string tooltip, ConfigValue<float> configValue, float defaultValue = 0, float minValue = 0, float maxValue = 10)
172-
{
173-
var slider = new ReMenuSlider(text, tooltip, configValue.SetValue, _container, configValue, minValue, maxValue);
174-
return slider;
175-
}
176-
177165
public ReMenuPage AddMenuPage(string text, string tooltip = "", Sprite sprite = null)
178166
{
179167
var existingPage = GetMenuPage(text);
@@ -217,4 +205,4 @@ public static ReMenuPage Create(string text, bool isRoot)
217205
return new ReMenuPage(text, isRoot);
218206
}
219207
}
220-
}
208+
}

‎UI/QuickMenu/ReMenuSlider.cs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ public class ReMenuSlider : UiElement
1212
{
1313
private readonly Slider _sliderComponent;
1414

15-
public bool Interactable
16-
{
17-
get => _sliderComponent.interactable;
18-
set => _sliderComponent.interactable = value;
19-
}
20-
2115
private float _valueHolder;
2216

2317
public ReMenuSlider(string text, string tooltip, Action<float> onSlide, Transform parent, float defaultValue = 0, float minValue = 0, float maxValue = 10) : base(QuickMenuEx.SliderPrefab, parent, $"Slider_{text}")
@@ -48,11 +42,6 @@ public ReMenuSlider(string text, string tooltip, Action<float> onSlide, Transfor
4842
var edl = GameObject.AddComponent<EnableDisableListener>();
4943
}
5044

51-
public ReMenuSlider(Transform transform) : base(transform)
52-
{
53-
_sliderComponent = GameObject.GetComponent<Slider>();
54-
}
55-
5645
public void Slide(float value, bool callback = true)
5746
{
5847
_valueHolder = value;

‎UI/QuickMenu/ReSliderCategory.cs‎

Lines changed: 1 addition & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public ReMenuSliderContainer(Transform transform) : base(transform)
4747
}
4848
}
4949

50-
public class ReMenuSliderCategory : IButtonPage
50+
public class ReMenuSliderCategory
5151
{
5252
public readonly ReMenuHeader Header;
5353
private readonly ReMenuSliderContainer _sliderContainer;
@@ -58,16 +58,6 @@ public string Title
5858
set => Header.Title = value;
5959
}
6060

61-
public bool Active
62-
{
63-
get => _sliderContainer.GameObject.activeInHierarchy;
64-
set
65-
{
66-
Header.Active = value;
67-
_sliderContainer.Active = value;
68-
}
69-
}
70-
7161
public ReMenuSliderCategory(string title, Transform parent = null, bool collapsible = true)
7262
{
7363
if (collapsible)
@@ -92,24 +82,6 @@ public ReMenuSliderCategory(ReMenuHeader headerElement, ReMenuSliderContainer co
9282
_sliderContainer = container;
9383
}
9484

95-
public ReMenuButton AddButton(string text, string tooltip, Action onClick, Sprite sprite = null)
96-
{
97-
var button = new ReMenuButton(text, tooltip, onClick, _sliderContainer.RectTransform, sprite);
98-
return button;
99-
}
100-
101-
public ReMenuToggle AddToggle(string text, string tooltip, Action<bool> onToggle, bool defaultValue = false)
102-
{
103-
var toggle = new ReMenuToggle(text, tooltip, onToggle, _sliderContainer.RectTransform, defaultValue);
104-
return toggle;
105-
}
106-
107-
public ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue)
108-
{
109-
var toggle = new ReMenuToggle(text, tooltip, configValue.SetValue, _sliderContainer.RectTransform, configValue);
110-
return toggle;
111-
}
112-
11385
public ReMenuSlider AddSlider(string text, string tooltip, Action<float> onSlide, float defaultValue = 0, float minValue = 0, float maxValue = 10)
11486
{
11587
var slider = new ReMenuSlider(text, tooltip, onSlide, _sliderContainer.RectTransform, defaultValue, minValue, maxValue);
@@ -122,44 +94,5 @@ public ReMenuSlider AddSlider(string text, string tooltip, ConfigValue<float> co
12294
return slider;
12395
}
12496

125-
public ReMenuPage AddMenuPage(string text, string tooltip = "", Sprite sprite = null)
126-
{
127-
var existingPage = GetMenuPage(text);
128-
if (existingPage != null)
129-
{
130-
return existingPage;
131-
}
132-
133-
var menu = new ReMenuPage(text);
134-
AddButton(text, string.IsNullOrEmpty(tooltip) ? $"Open the {text} menu" : tooltip, menu.Open, sprite);
135-
return menu;
136-
}
137-
138-
public ReCategoryPage AddCategoryPage(string text, string tooltip = "", Sprite sprite = null)
139-
{
140-
var existingPage = GetCategoryPage(text);
141-
if (existingPage != null)
142-
{
143-
return existingPage;
144-
}
145-
146-
var menu = new ReCategoryPage(text);
147-
AddButton(text, string.IsNullOrEmpty(tooltip) ? $"Open the {text} menu" : tooltip, menu.Open, sprite);
148-
return menu;
149-
}
150-
151-
public RectTransform RectTransform => _sliderContainer.RectTransform;
152-
153-
public ReMenuPage GetMenuPage(string name)
154-
{
155-
var transform = QuickMenuEx.MenuParent.Find(UiElement.GetCleanName($"Menu_{name}"));
156-
return transform == null ? null : new ReMenuPage(transform);
157-
}
158-
159-
public ReCategoryPage GetCategoryPage(string name)
160-
{
161-
var transform = QuickMenuEx.MenuParent.Find(UiElement.GetCleanName($"Menu_{name}"));
162-
return transform == null ? null : new ReCategoryPage(transform);
163-
}
16497
}
16598
}

0 commit comments

Comments
 (0)