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

Commit d1f4f74

Browse files
sinai-devsinai-dev
committed
some ui cleanups (minor)
1 parent f13068b commit d1f4f74

File tree

5 files changed

+144
-130
lines changed

5 files changed

+144
-130
lines changed

‎src/Inspectors/Reflection/InteractiveValue/InteractiveValue.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,9 @@ public string GetDefaultLabel(bool updateType = true)
229229

230230
string toString;
231231
if (m_toStringFormatMethod != null)
232-
{
233232
toString = (string)m_toStringFormatMethod.Invoke(Value, new object[] { "F3" });
234-
}
235233
else
236-
{
237234
toString = (string)m_toStringMethod.Invoke(Value, new object[0]);
238-
}
239235

240236
var fullnametemp = valueType.ToString();
241237
if (fullnametemp.StartsWith("Il2CppSystem"))

‎src/UI/Modules/SearchPage.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private void RefreshResultList()
153153
{
154154
var name = UISyntaxHighlight.ParseFullSyntax(obj.GetActualType(), true);
155155

156-
if (unityObj && m_context != SearchContext.Singleton && m_context != SearchContext.StaticClass)
156+
if (unityObj && m_context != SearchContext.Singleton)
157157
{
158158
if (unityObj && !string.IsNullOrEmpty(unityObj.name))
159159
name += $": {unityObj.name}";
@@ -301,8 +301,8 @@ private void SingletonSearch()
301301

302302
foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
303303
{
304-
// All non-static classes
305-
foreach (var type in asm.TryGetTypes().Where(it => !it.IsSealed && !it.IsAbstract))
304+
// Search all non-static, non-enum classes.
305+
foreach (var type in asm.TryGetTypes().Where(it => !(it.IsSealed && it.IsAbstract) && !it.IsEnum))
306306
{
307307
try
308308
{
@@ -336,7 +336,7 @@ private void SingletonSearch()
336336
if (instance != null)
337337
{
338338
instances.Add(instance);
339-
continue;
339+
break;
340340
}
341341
}
342342
}

‎src/UI/Shared/InputFieldScroller.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ public InputFieldScroller(SliderScrollbar sliderScroller, InputField inputField)
3333
this.sliderScroller = sliderScroller;
3434
this.inputField = inputField;
3535

36+
sliderScroller.m_parentInputScroller = this;
37+
3638
inputField.onValueChanged.AddListener(OnTextChanged);
3739

3840
inputRect = inputField.GetComponent<RectTransform>();
@@ -68,6 +70,17 @@ public void Update()
6870
}
6971
}
7072

73+
internal bool CheckDestroyed()
74+
{
75+
if (sliderScroller == null || sliderScroller.CheckDestroyed())
76+
{
77+
Instances.Remove(this);
78+
return true;
79+
}
80+
81+
return false;
82+
}
83+
7184
internal void OnTextChanged(string text)
7285
{
7386
m_lastText = text;

‎src/UI/Shared/SliderScrollbar.cs‎

Lines changed: 126 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -8,149 +8,153 @@
88
using UnityExplorer.Helpers;
99
using UnityExplorer.UI;
1010

11-
// Basically just to fix an issue with Scrollbars, instead we use a Slider as the scrollbar.
12-
public class SliderScrollbar
11+
namespace UnityExplorer.UI.Shared
1312
{
14-
internal static readonly List<SliderScrollbar> Instances = new List<SliderScrollbar>();
13+
// Basically just to fix an issue with Scrollbars, instead we use a Slider as the scrollbar.
14+
public class SliderScrollbar
15+
{
16+
internal static readonly List<SliderScrollbar> Instances = new List<SliderScrollbar>();
1517

16-
public bool IsActive { get; private set; }
18+
public bool IsActive { get; private set; }
1719

18-
internal readonly Scrollbar m_scrollbar;
19-
internal readonly Slider m_slider;
20-
internal readonly RectTransform m_scrollRect;
20+
internal readonly Scrollbar m_scrollbar;
21+
internal readonly Slider m_slider;
22+
internal readonly RectTransform m_scrollRect;
2123

22-
public SliderScrollbar(Scrollbar scrollbar, Slider slider)
23-
{
24-
Instances.Add(this);
24+
internal InputFieldScroller m_parentInputScroller;
2525

26-
this.m_scrollbar = scrollbar;
27-
this.m_slider = slider;
28-
this.m_scrollRect = scrollbar.transform.parent.GetComponent<RectTransform>();
26+
public SliderScrollbar(Scrollbar scrollbar, Slider slider)
27+
{
28+
Instances.Add(this);
2929

30-
this.m_scrollbar.onValueChanged.AddListener(this.OnScrollbarValueChanged);
31-
this.m_slider.onValueChanged.AddListener(this.OnSliderValueChanged);
30+
this.m_scrollbar = scrollbar;
31+
this.m_slider = slider;
32+
this.m_scrollRect = scrollbar.transform.parent.GetComponent<RectTransform>();
3233

33-
this.RefreshVisibility();
34-
this.m_slider.Set(1f, false);
35-
}
34+
this.m_scrollbar.onValueChanged.AddListener(this.OnScrollbarValueChanged);
35+
this.m_slider.onValueChanged.AddListener(this.OnSliderValueChanged);
3636

37-
internal bool CheckDestroyed()
38-
{
39-
if (!m_slider || !m_scrollbar)
40-
{
41-
Instances.Remove(this);
42-
return true;
37+
this.RefreshVisibility();
38+
this.m_slider.Set(1f, false);
4339
}
4440

45-
return false;
46-
}
41+
internal bool CheckDestroyed()
42+
{
43+
if (!m_slider || !m_scrollbar)
44+
{
45+
Instances.Remove(this);
46+
return true;
47+
}
4748

48-
internal void Update()
49-
{
50-
this.RefreshVisibility();
51-
}
49+
return false;
50+
}
5251

53-
internal void RefreshVisibility()
54-
{
55-
if (!m_slider.gameObject.activeInHierarchy)
52+
internal void Update()
5653
{
57-
IsActive = false;
58-
return;
54+
this.RefreshVisibility();
5955
}
6056

61-
bool shouldShow = !Mathf.Approximately(this.m_scrollbar.size, 1);
62-
var obj = this.m_slider.handleRect.gameObject;
63-
64-
if (IsActive != shouldShow)
57+
internal void RefreshVisibility()
6558
{
66-
IsActive = shouldShow;
67-
obj.SetActive(IsActive);
59+
if (!m_slider.gameObject.activeInHierarchy)
60+
{
61+
IsActive = false;
62+
return;
63+
}
64+
65+
bool shouldShow = !Mathf.Approximately(this.m_scrollbar.size, 1);
66+
var obj = this.m_slider.handleRect.gameObject;
6867

69-
if (IsActive)
70-
this.m_slider.Set(this.m_scrollbar.value, false);
71-
else
72-
m_slider.Set(1f, false);
68+
if (IsActive != shouldShow)
69+
{
70+
IsActive = shouldShow;
71+
obj.SetActive(IsActive);
72+
73+
if (IsActive)
74+
this.m_slider.Set(this.m_scrollbar.value, false);
75+
else
76+
m_slider.Set(1f, false);
77+
}
7378
}
74-
}
7579

76-
public void OnScrollbarValueChanged(float _value)
77-
{
78-
if (this.m_slider.value != _value)
79-
this.m_slider.Set(_value, false);
80-
}
80+
public void OnScrollbarValueChanged(float _value)
81+
{
82+
if (this.m_slider.value != _value)
83+
this.m_slider.Set(_value, false);
84+
}
8185

82-
public void OnSliderValueChanged(float _value)
83-
{
84-
this.m_scrollbar.value = _value;
85-
}
86+
public void OnSliderValueChanged(float _value)
87+
{
88+
this.m_scrollbar.value = _value;
89+
}
8690

87-
#region UI CONSTRUCTION
91+
#region UI CONSTRUCTION
8892

89-
public static GameObject CreateSliderScrollbar(GameObject parent, out Slider slider)
90-
{
91-
GameObject sliderObj = UIFactory.CreateUIObject("Slider", parent, UIFactory.thinSize);
92-
93-
GameObject bgObj = UIFactory.CreateUIObject("Background", sliderObj);
94-
GameObject fillAreaObj = UIFactory.CreateUIObject("Fill Area", sliderObj);
95-
GameObject fillObj = UIFactory.CreateUIObject("Fill", fillAreaObj);
96-
GameObject handleSlideAreaObj = UIFactory.CreateUIObject("Handle Slide Area", sliderObj);
97-
GameObject handleObj = UIFactory.CreateUIObject("Handle", handleSlideAreaObj);
98-
99-
Image bgImage = bgObj.AddComponent<Image>();
100-
bgImage.type = Image.Type.Sliced;
101-
bgImage.color = new Color(0.05f, 0.05f, 0.05f, 1.0f);
102-
103-
RectTransform bgRect = bgObj.GetComponent<RectTransform>();
104-
bgRect.anchorMin = Vector2.zero;
105-
bgRect.anchorMax = Vector2.one;
106-
bgRect.sizeDelta = Vector2.zero;
107-
bgRect.offsetMax = new Vector2(-10f, 0f);
108-
109-
RectTransform fillAreaRect = fillAreaObj.GetComponent<RectTransform>();
110-
fillAreaRect.anchorMin = new Vector2(0f, 0.25f);
111-
fillAreaRect.anchorMax = new Vector2(1f, 0.75f);
112-
fillAreaRect.anchoredPosition = new Vector2(-5f, 0f);
113-
fillAreaRect.sizeDelta = new Vector2(-20f, 0f);
114-
115-
Image fillImage = fillObj.AddComponent<Image>();
116-
fillImage.type = Image.Type.Sliced;
117-
fillImage.color = Color.clear;
118-
119-
fillObj.GetComponent<RectTransform>().sizeDelta = new Vector2(10f, 0f);
120-
121-
RectTransform handleSlideRect = handleSlideAreaObj.GetComponent<RectTransform>();
122-
handleSlideRect.anchorMin = new Vector2(0f, 0f);
123-
handleSlideRect.anchorMax = new Vector2(1f, 1f);
124-
handleSlideRect.offsetMin = new Vector2(15f, 30f);
125-
handleSlideRect.offsetMax = new Vector2(-15f, 0f);
126-
handleSlideRect.sizeDelta = new Vector2(-30f, -30f);
127-
128-
Image handleImage = handleObj.AddComponent<Image>();
129-
handleImage.color = new Color(0.5f, 0.5f, 0.5f, 1.0f);
130-
131-
var handleRect = handleObj.GetComponent<RectTransform>();
132-
handleRect.sizeDelta = new Vector2(15f, 30f);
133-
handleRect.offsetMin = new Vector2(-13f, -28f);
134-
handleRect.offsetMax = new Vector2(3f, -2f);
135-
136-
var sliderBarLayout = sliderObj.AddComponent<LayoutElement>();
137-
sliderBarLayout.minWidth = 25;
138-
sliderBarLayout.flexibleWidth = 0;
139-
sliderBarLayout.minHeight = 30;
140-
sliderBarLayout.flexibleHeight = 5000;
141-
142-
slider = sliderObj.AddComponent<Slider>();
143-
slider.fillRect = fillObj.GetComponent<RectTransform>();
144-
slider.handleRect = handleObj.GetComponent<RectTransform>();
145-
slider.targetGraphic = handleImage;
146-
slider.direction = Slider.Direction.BottomToTop;
147-
UIFactory.SetDefaultColorTransitionValues(slider);
148-
149-
return sliderObj;
150-
}
93+
public static GameObject CreateSliderScrollbar(GameObject parent, out Slider slider)
94+
{
95+
GameObject sliderObj = UIFactory.CreateUIObject("Slider", parent, UIFactory.thinSize);
96+
97+
GameObject bgObj = UIFactory.CreateUIObject("Background", sliderObj);
98+
GameObject fillAreaObj = UIFactory.CreateUIObject("Fill Area", sliderObj);
99+
GameObject fillObj = UIFactory.CreateUIObject("Fill", fillAreaObj);
100+
GameObject handleSlideAreaObj = UIFactory.CreateUIObject("Handle Slide Area", sliderObj);
101+
GameObject handleObj = UIFactory.CreateUIObject("Handle", handleSlideAreaObj);
102+
103+
Image bgImage = bgObj.AddComponent<Image>();
104+
bgImage.type = Image.Type.Sliced;
105+
bgImage.color = new Color(0.05f, 0.05f, 0.05f, 1.0f);
106+
107+
RectTransform bgRect = bgObj.GetComponent<RectTransform>();
108+
bgRect.anchorMin = Vector2.zero;
109+
bgRect.anchorMax = Vector2.one;
110+
bgRect.sizeDelta = Vector2.zero;
111+
bgRect.offsetMax = new Vector2(-10f, 0f);
112+
113+
RectTransform fillAreaRect = fillAreaObj.GetComponent<RectTransform>();
114+
fillAreaRect.anchorMin = new Vector2(0f, 0.25f);
115+
fillAreaRect.anchorMax = new Vector2(1f, 0.75f);
116+
fillAreaRect.anchoredPosition = new Vector2(-5f, 0f);
117+
fillAreaRect.sizeDelta = new Vector2(-20f, 0f);
118+
119+
Image fillImage = fillObj.AddComponent<Image>();
120+
fillImage.type = Image.Type.Sliced;
121+
fillImage.color = Color.clear;
122+
123+
fillObj.GetComponent<RectTransform>().sizeDelta = new Vector2(10f, 0f);
124+
125+
RectTransform handleSlideRect = handleSlideAreaObj.GetComponent<RectTransform>();
126+
handleSlideRect.anchorMin = new Vector2(0f, 0f);
127+
handleSlideRect.anchorMax = new Vector2(1f, 1f);
128+
handleSlideRect.offsetMin = new Vector2(15f, 30f);
129+
handleSlideRect.offsetMax = new Vector2(-15f, 0f);
130+
handleSlideRect.sizeDelta = new Vector2(-30f, -30f);
131+
132+
Image handleImage = handleObj.AddComponent<Image>();
133+
handleImage.color = new Color(0.5f, 0.5f, 0.5f, 1.0f);
134+
135+
var handleRect = handleObj.GetComponent<RectTransform>();
136+
handleRect.sizeDelta = new Vector2(15f, 30f);
137+
handleRect.offsetMin = new Vector2(-13f, -28f);
138+
handleRect.offsetMax = new Vector2(3f, -2f);
139+
140+
var sliderBarLayout = sliderObj.AddComponent<LayoutElement>();
141+
sliderBarLayout.minWidth = 25;
142+
sliderBarLayout.flexibleWidth = 0;
143+
sliderBarLayout.minHeight = 30;
144+
sliderBarLayout.flexibleHeight = 5000;
145+
146+
slider = sliderObj.AddComponent<Slider>();
147+
slider.fillRect = fillObj.GetComponent<RectTransform>();
148+
slider.handleRect = handleObj.GetComponent<RectTransform>();
149+
slider.targetGraphic = handleImage;
150+
slider.direction = Slider.Direction.BottomToTop;
151+
UIFactory.SetDefaultColorTransitionValues(slider);
152+
153+
return sliderObj;
154+
}
151155

152-
#endregion
153-
}
156+
#endregion
157+
}
154158

155159
#if MONO
156160
public static class SliderExtensions
@@ -175,4 +179,5 @@ public static void Set(this Slider slider, float value, bool invokeCallback)
175179
SetMethod.Invoke(slider, new object[] { value, invokeCallback });
176180
}
177181
}
178-
#endif
182+
#endif
183+
}

‎src/UI/UIManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public static void Update()
8181
{
8282
var input = InputFieldScroller.Instances[i];
8383

84-
if (input.sliderScroller.CheckDestroyed())
84+
if (input.CheckDestroyed())
8585
i--;
8686
else
8787
input.Update();

0 commit comments

Comments
 (0)