Skip to content

Commit 762ac7e

Browse files
committed
Update toolbar logic and add unitypackage
Simplified the anchor size clearing and page rebuild logic in ToolbarController.cs by removing delayed execution and recursive resizing. Deleted obsolete TestData.meta file, added TableForge-1.0.2.unitypackage, and updated default layout settings for improved window arrangement.
1 parent 53100c3 commit 762ac7e

File tree

4 files changed

+63
-75
lines changed

4 files changed

+63
-75
lines changed

Assets/TableForge/Editor/PersistentData/TestData.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/TableForge/Editor/UI/Windows/TableVisualizerWindow/Toolbar/ToolbarController.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,12 +315,8 @@ private void RegisterEvents()
315315
{
316316
if (_selectedTab == null) return;
317317

318+
_tableVisualizer.CurrentTable.Metadata.ClearAnchorSizes();
318319
_tableVisualizer.CurrentTable.RebuildPage(false);
319-
_tableVisualizer.CurrentTable.schedule.Execute(() =>
320-
{
321-
_tableVisualizer.CurrentTable.Metadata.ClearAnchorSizes();
322-
_tableVisualizer.CurrentTable.ResizeAllRecursively(false, true);
323-
}).ExecuteLater(5);
324320
};
325321
}
326322

628 KB
Binary file not shown.

UserSettings/Layouts/default-6000.dwlt

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
m_PixelRect:
1616
serializedVersion: 2
17-
x: 2560
18-
y: 43
19-
width: 1920
20-
height: 989
17+
x: 0
18+
y: 42.666668
19+
width: 1706.6667
20+
height: 976
2121
m_ShowMode: 4
22-
m_Title: Project
22+
m_Title: Inspector
2323
m_RootView: {fileID: 2}
2424
m_MinSize: {x: 875, y: 300}
2525
m_MaxSize: {x: 10000, y: 10000}
@@ -44,8 +44,8 @@ MonoBehaviour:
4444
serializedVersion: 2
4545
x: 0
4646
y: 0
47-
width: 1920
48-
height: 989
47+
width: 1706.6666
48+
height: 976
4949
m_MinSize: {x: 875, y: 300}
5050
m_MaxSize: {x: 10000, y: 10000}
5151
m_UseTopView: 1
@@ -69,7 +69,7 @@ MonoBehaviour:
6969
serializedVersion: 2
7070
x: 0
7171
y: 0
72-
width: 1920
72+
width: 1706.6666
7373
height: 36
7474
m_MinSize: {x: 0, y: 0}
7575
m_MaxSize: {x: 0, y: 0}
@@ -90,8 +90,8 @@ MonoBehaviour:
9090
m_Position:
9191
serializedVersion: 2
9292
x: 0
93-
y: 969
94-
width: 1920
93+
y: 956
94+
width: 1706.6666
9595
height: 20
9696
m_MinSize: {x: 0, y: 0}
9797
m_MaxSize: {x: 0, y: 0}
@@ -113,12 +113,12 @@ MonoBehaviour:
113113
serializedVersion: 2
114114
x: 0
115115
y: 36
116-
width: 1920
117-
height: 933
116+
width: 1706.6666
117+
height: 920
118118
m_MinSize: {x: 300, y: 100}
119119
m_MaxSize: {x: 24288, y: 16192}
120120
vertical: 1
121-
controlID: 53
121+
controlID: 130
122122
draggingID: 0
123123
--- !u!114 &6
124124
MonoBehaviour:
@@ -139,12 +139,12 @@ MonoBehaviour:
139139
serializedVersion: 2
140140
x: 0
141141
y: 0
142-
width: 1920
143-
height: 933
142+
width: 1706.6666
143+
height: 920
144144
m_MinSize: {x: 300, y: 100}
145145
m_MaxSize: {x: 24288, y: 16192}
146146
vertical: 0
147-
controlID: 54
147+
controlID: 131
148148
draggingID: 0
149149
--- !u!114 &7
150150
MonoBehaviour:
@@ -165,12 +165,12 @@ MonoBehaviour:
165165
serializedVersion: 2
166166
x: 0
167167
y: 0
168-
width: 1545
169-
height: 933
168+
width: 1373.3334
169+
height: 920
170170
m_MinSize: {x: 200, y: 100}
171171
m_MaxSize: {x: 16192, y: 16192}
172172
vertical: 1
173-
controlID: 55
173+
controlID: 18
174174
draggingID: 0
175175
--- !u!114 &8
176176
MonoBehaviour:
@@ -189,8 +189,8 @@ MonoBehaviour:
189189
serializedVersion: 2
190190
x: 0
191191
y: 0
192-
width: 1545
193-
height: 646
192+
width: 1373.3334
193+
height: 690.6667
194194
m_MinSize: {x: 201, y: 226}
195195
m_MaxSize: {x: 4001, y: 4026}
196196
m_ActualView: {fileID: 18}
@@ -201,7 +201,7 @@ MonoBehaviour:
201201
- {fileID: 19}
202202
- {fileID: 15}
203203
m_Selected: 2
204-
m_LastSelected: 4
204+
m_LastSelected: 2
205205
--- !u!114 &9
206206
MonoBehaviour:
207207
m_ObjectHideFlags: 52
@@ -220,13 +220,13 @@ MonoBehaviour:
220220
m_Position:
221221
serializedVersion: 2
222222
x: 0
223-
y: 646
224-
width: 1545
225-
height: 287
223+
y: 690.6667
224+
width: 1373.3334
225+
height: 229.33331
226226
m_MinSize: {x: 200, y: 50}
227227
m_MaxSize: {x: 16192, y: 8096}
228228
vertical: 0
229-
controlID: 56
229+
controlID: 98
230230
draggingID: 0
231231
--- !u!114 &10
232232
MonoBehaviour:
@@ -245,8 +245,8 @@ MonoBehaviour:
245245
serializedVersion: 2
246246
x: 0
247247
y: 0
248-
width: 1074
249-
height: 287
248+
width: 954.6667
249+
height: 229.33331
250250
m_MinSize: {x: 231, y: 276}
251251
m_MaxSize: {x: 10001, y: 10026}
252252
m_ActualView: {fileID: 20}
@@ -269,10 +269,10 @@ MonoBehaviour:
269269
m_Children: []
270270
m_Position:
271271
serializedVersion: 2
272-
x: 1074
272+
x: 954.6667
273273
y: 0
274-
width: 471
275-
height: 287
274+
width: 418.6667
275+
height: 229.33331
276276
m_MinSize: {x: 102, y: 126}
277277
m_MaxSize: {x: 4002, y: 4026}
278278
m_ActualView: {fileID: 21}
@@ -295,10 +295,10 @@ MonoBehaviour:
295295
m_Children: []
296296
m_Position:
297297
serializedVersion: 2
298-
x: 1545
298+
x: 1373.3334
299299
y: 0
300-
width: 375
301-
height: 933
300+
width: 333.33325
301+
height: 920
302302
m_MinSize: {x: 276, y: 76}
303303
m_MaxSize: {x: 4001, y: 4026}
304304
m_ActualView: {fileID: 22}
@@ -4126,8 +4126,8 @@ MonoBehaviour:
41264126
serializedVersion: 2
41274127
x: 0
41284128
y: 24
4129-
width: 1544
4130-
height: 620
4129+
width: 1372.3334
4130+
height: 664.6667
41314131
m_SerializedDataModeController:
41324132
m_DataMode: 0
41334133
m_PreferredDataMode: 0
@@ -4169,8 +4169,8 @@ MonoBehaviour:
41694169
m_VAllowExceedBaseRangeMin: 1
41704170
m_VAllowExceedBaseRangeMax: 1
41714171
m_ScaleWithWindow: 0
4172-
m_HSlider: 1
4173-
m_VSlider: 1
4172+
m_HSlider: 0
4173+
m_VSlider: 0
41744174
m_IgnoreScrollWheelUntilClicked: 0
41754175
m_EnableMouseInput: 1
41764176
m_EnableSliderZoomHorizontal: 0
@@ -4181,23 +4181,23 @@ MonoBehaviour:
41814181
serializedVersion: 2
41824182
x: 0
41834183
y: 21
4184-
width: 1544
4185-
height: 599
4186-
m_Scale: {x: 0.62395835, y: 0.62395835}
4187-
m_Translation: {x: 772, y: 299.5}
4184+
width: 1372.3334
4185+
height: 643.6667
4186+
m_Scale: {x: 0.67048615, y: 0.67048615}
4187+
m_Translation: {x: 686.1667, y: 321.83334}
41884188
m_MarginLeft: 0
41894189
m_MarginRight: 0
41904190
m_MarginTop: 0
41914191
m_MarginBottom: 0
41924192
m_LastShownAreaInsideMargins:
41934193
serializedVersion: 2
4194-
x: -1237.2621
4194+
x: -1023.38684
41954195
y: -480
4196-
width: 2474.5242
4196+
width: 2046.7737
41974197
height: 960
41984198
m_MinimalGUI: 1
4199-
m_defaultScale: 0.62395835
4200-
m_LastWindowPixelSize: {x: 1544, y: 620}
4199+
m_defaultScale: 0.67048615
4200+
m_LastWindowPixelSize: {x: 1372.3334, y: 664.6667}
42014201
m_ClearInEditMode: 1
42024202
m_NoCameraWarning: 1
42034203
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -4292,8 +4292,8 @@ MonoBehaviour:
42924292
serializedVersion: 2
42934293
x: 0
42944294
y: 24
4295-
width: 1073
4296-
height: 261
4295+
width: 953.6667
4296+
height: 203.33331
42974297
m_SerializedDataModeController:
42984298
m_DataMode: 0
42994299
m_PreferredDataMode: 0
@@ -4316,7 +4316,7 @@ MonoBehaviour:
43164316
m_SkipHidden: 0
43174317
m_SearchArea: 1
43184318
m_Folders:
4319-
- Assets
4319+
- Assets/TableForge/Editor/PersistentData
43204320
m_Globs: []
43214321
m_ProductIds:
43224322
m_AnyWithAssetOrigin: 0
@@ -4326,16 +4326,16 @@ MonoBehaviour:
43264326
m_ViewMode: 1
43274327
m_StartGridSize: 74
43284328
m_LastFolders:
4329-
- Assets
4329+
- Assets/TableForge/Editor/PersistentData
43304330
m_LastFoldersGridSize: 74
43314331
m_LastProjectPath: C:\Users\joseg\Documents\GitHub\TableForge
43324332
m_LockTracker:
43334333
m_IsLocked: 0
43344334
m_FolderTreeState:
43354335
scrollPos: {x: 0, y: 79}
4336-
m_SelectedIDs: 8a0c0100
4337-
m_LastClickedID: 68746
4338-
m_ExpandedIDs: 000000008a0c01008c0c01008e0c0100900c0100920c0100940c0100960c0100980c01009a0c01009c0c01009e0c0100a00c0100a20c0100a40c0100a60c0100a80c0100
4336+
m_SelectedIDs: 4ac00000
4337+
m_LastClickedID: 49226
4338+
m_ExpandedIDs: 0000000048be00004abe00004cbe00004ebe000050be000052be000054be000056be000058be00005abe00005cbe00005ebe000060be000062be000064be000066be0000
43394339
m_RenameOverlay:
43404340
m_UserAcceptedRename: 0
43414341
m_Name:
@@ -4364,7 +4364,7 @@ MonoBehaviour:
43644364
scrollPos: {x: 0, y: 0}
43654365
m_SelectedIDs:
43664366
m_LastClickedID: 0
4367-
m_ExpandedIDs: 000000008a0c01008c0c01008e0c0100900c0100920c0100940c0100960c0100980c01009a0c01009c0c01009e0c0100a00c0100a20c0100a40c0100a60c0100a80c0100
4367+
m_ExpandedIDs: 0000000048be00004abe00004cbe00004ebe000050be000052be000054be000056be000058be00005abe00005cbe00005ebe000060be000062be000064be000066be0000
43684368
m_RenameOverlay:
43694369
m_UserAcceptedRename: 0
43704370
m_Name:
@@ -4392,7 +4392,7 @@ MonoBehaviour:
43924392
m_ListAreaState:
43934393
m_SelectedInstanceIDs:
43944394
m_LastClickedInstanceID: 0
4395-
m_HadKeyboardFocusLastEvent: 1
4395+
m_HadKeyboardFocusLastEvent: 0
43964396
m_ExpandedInstanceIDs: c623000050370100e00f010082be0300a232010064340100fe20ffff6e20ffff2cbc000000000000c07e0000
43974397
m_RenameOverlay:
43984398
m_UserAcceptedRename: 0
@@ -4410,7 +4410,7 @@ MonoBehaviour:
44104410
m_OriginalEventType: 11
44114411
m_IsRenamingFilename: 1
44124412
m_TrimLeadingAndTrailingWhitespace: 0
4413-
m_ClientGUIView: {fileID: 10}
4413+
m_ClientGUIView: {fileID: 8}
44144414
m_CreateAssetUtility:
44154415
m_EndAction: {fileID: 0}
44164416
m_InstanceID: 0
@@ -4443,10 +4443,10 @@ MonoBehaviour:
44434443
m_TextWithWhitespace: "Console\u200B"
44444444
m_Pos:
44454445
serializedVersion: 2
4446-
x: 1075
4446+
x: 955.6667
44474447
y: 24
4448-
width: 469
4449-
height: 261
4448+
width: 416.6667
4449+
height: 203.33331
44504450
m_SerializedDataModeController:
44514451
m_DataMode: 0
44524452
m_PreferredDataMode: 0
@@ -4479,10 +4479,10 @@ MonoBehaviour:
44794479
m_TextWithWhitespace: "Inspector\u200B"
44804480
m_Pos:
44814481
serializedVersion: 2
4482-
x: 1546
4482+
x: 1374.3334
44834483
y: 24
4484-
width: 374
4485-
height: 907
4484+
width: 332.33325
4485+
height: 894
44864486
m_SerializedDataModeController:
44874487
m_DataMode: 0
44884488
m_PreferredDataMode: 0

0 commit comments

Comments
 (0)