Skip to content

Commit e72d88f

Browse files
committed
Compatibility with unity 2022.1
1 parent 8d67068 commit e72d88f

File tree

7 files changed

+28
-34
lines changed

7 files changed

+28
-34
lines changed

Packages/com.quickeye.http-debugger/Editor/Elements/ConsoleCells.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ public UrlCell()
4747
{
4848
AddToClassList("cell-text");
4949
AddToClassList("url-cell");
50+
#if UNITY_2022_2_OR_NEWER
5051
selection.isSelectable = true;
52+
#endif
5153
}
5254

5355
public void Setup(string url)

Packages/com.quickeye.http-debugger/Editor/UIAssets/RequestConsole.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,11 @@ public void Init(VisualElement root)
4545
InitColumns();
4646
InitClearButton();
4747
InitSearchField();
48-
48+
#if UNITY_2022_2_OR_NEWER
4949
requestList.selectionChanged += items =>
50+
#else
51+
requestList.onSelectionChange += items =>
52+
#endif
5053
{
5154
SelectionChanged?.Invoke(items.FirstOrDefault() as RequestData);
5255
};
@@ -118,7 +121,7 @@ private void InitColumns()
118121
{
119122
((Label)element).text = ((ConsoleRequestData)Source[i]).timestamp.ToString();
120123
};
121-
124+
122125
resultCol.makeCell = () => new ResultCell();
123126
resultCol.bindCell = (element, i) =>
124127
{

Packages/com.quickeye.http-debugger/Editor/UIAssets/RequestStash.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private void OnRequestListModification(RequestData obj)
5757
{
5858
stashList.Rebuild();
5959
}
60-
60+
6161
private void SetupList(IList propList)
6262
{
6363
stashList.itemsSource = propList;
@@ -104,7 +104,11 @@ private void InitList()
104104
stashList.Rebuild();
105105
};
106106
};
107+
#if UNITY_2022_2_OR_NEWER
107108
stashList.selectionChanged += selection =>
109+
#else
110+
stashList.onSelectionChange += selection =>
111+
#endif
108112
{
109113
SelectionChanged?.Invoke((RequestData)selection.FirstOrDefault());
110114
};
@@ -115,7 +119,7 @@ private void InitList()
115119
newRequest.name = "New Request";
116120
newRequest.type = HttpMethodType.Get;
117121
newRequest.content = "{ }";
118-
122+
119123
_requestList.Add(newRequest);
120124
stashList.Rebuild();
121125
};

Packages/com.quickeye.http-debugger/Editor/UIAssets/RequestView.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ public RequestView(VisualElement root)
2323
_root = root;
2424
AssignQueryResults(root);
2525
_headersViewController = new HeadersView(headersView);
26+
#if UNITY_2022_2_OR_NEWER
2627
stackTraceView.RegisterCallback<PointerUpLinkTagEvent>(evt =>
2728
{
2829
var (filePath, line) = _linksByLinkText[evt.linkText];
2930
InternalEditorUtility.OpenFileAtLineExternal(filePath, line);
3031
});
3132
stackTraceLabel.selection.isSelectable = true;
33+
#endif
3234
InitTabs();
3335
}
3436

Packages/com.quickeye.http-debugger/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "com.quickeye.http-debugger",
33
"displayName": "HTTP Debugger",
44
"author": "Quick Eye",
5-
"version": "1.0.0",
5+
"version": "1.0.1",
66
"unity": "2022.1",
77
"description": "HTTP request logging tool for Unity.\nNon UPM dependencies:\n- com.quickeye.ui-toolkit-plus (https://github.com/ErnSur/UI-Toolkit-Plus.git)",
88
"type": "library",

Packages/manifest.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"com.unity.ide.rider": "3.0.15",
77
"com.unity.ide.visualstudio": "2.0.16",
88
"com.unity.ide.vscode": "1.2.5",
9-
"com.unity.shadergraph": "14.0.3",
109
"com.unity.test-framework": "1.1.33",
1110
"com.unity.textmeshpro": "3.0.6",
1211
"com.unity.ugui": "1.0.0",

Packages/packages-lock.json

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"depth": 0,
1414
"source": "git",
1515
"dependencies": {},
16-
"hash": "91da1260c2af927aa56fbec26b03871a8fc7941d"
16+
"hash": "bb25d98322029dddeda7fca8efd49bc9568f31a1"
1717
},
1818
"com.quickeye.utility": {
1919
"version": "https://github.com/ErnSur/QuickEye-Utility.git",
@@ -63,40 +63,13 @@
6363
"dependencies": {},
6464
"url": "https://packages.unity.com"
6565
},
66-
"com.unity.render-pipelines.core": {
67-
"version": "14.0.3",
68-
"depth": 1,
69-
"source": "builtin",
70-
"dependencies": {
71-
"com.unity.ugui": "1.0.0",
72-
"com.unity.modules.physics": "1.0.0",
73-
"com.unity.modules.terrain": "1.0.0",
74-
"com.unity.modules.jsonserialize": "1.0.0"
75-
}
76-
},
77-
"com.unity.searcher": {
78-
"version": "4.9.2",
79-
"depth": 1,
80-
"source": "registry",
81-
"dependencies": {},
82-
"url": "https://packages.unity.com"
83-
},
8466
"com.unity.settings-manager": {
8567
"version": "2.0.1",
8668
"depth": 1,
8769
"source": "registry",
8870
"dependencies": {},
8971
"url": "https://packages.unity.com"
9072
},
91-
"com.unity.shadergraph": {
92-
"version": "14.0.3",
93-
"depth": 0,
94-
"source": "builtin",
95-
"dependencies": {
96-
"com.unity.render-pipelines.core": "14.0.3",
97-
"com.unity.searcher": "4.9.2"
98-
}
99-
},
10073
"com.unity.test-framework": {
10174
"version": "1.1.33",
10275
"depth": 0,
@@ -264,6 +237,17 @@
264237
"version": "1.0.0",
265238
"depth": 0,
266239
"source": "builtin",
240+
"dependencies": {
241+
"com.unity.modules.ui": "1.0.0",
242+
"com.unity.modules.imgui": "1.0.0",
243+
"com.unity.modules.jsonserialize": "1.0.0",
244+
"com.unity.modules.uielementsnative": "1.0.0"
245+
}
246+
},
247+
"com.unity.modules.uielementsnative": {
248+
"version": "1.0.0",
249+
"depth": 1,
250+
"source": "builtin",
267251
"dependencies": {
268252
"com.unity.modules.ui": "1.0.0",
269253
"com.unity.modules.imgui": "1.0.0",

0 commit comments

Comments
 (0)