Skip to content

Commit fcdf1c4

Browse files
paulhazenWispyMouse
authored andcommitted
fix: Reduce changes for purposes of merging after development.
1 parent 5c77740 commit fcdf1c4

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

Assets/Plugins/Source/Editor/EditorWindows/EOSEditorWindow.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ protected virtual void OnDisable()
142142
/// <summary>
143143
/// Checks to see if the windows has been initialized.
144144
/// </summary>
145-
protected void CheckForInitialized()
145+
private void CheckForInitialized()
146146
{
147147
if (!_initializeTask.IsCompleted || _initialized)
148148
{
@@ -252,7 +252,7 @@ protected void SetIsEmbedded(bool? isEmbedded = null)
252252
/// <summary>
253253
/// Called by Unity to render the window. Should not be overridden by deriving classes.
254254
/// </summary>
255-
public virtual void OnGUI()
255+
public void OnGUI()
256256
{
257257
// don't do anything if not initialized
258258
if (!_initialized)
@@ -299,7 +299,6 @@ protected virtual void OnDestroy()
299299
Teardown();
300300
}
301301

302-
303302
/// <summary>
304303
/// Determines if the size of the window needs to be updated, and if it does, adjusts it.
305304
/// </summary>
@@ -325,7 +324,7 @@ private void AdjustWindowSize()
325324

326325
// Using the calculated minimum height, apply the aspect ratio to determine minimum width
327326
float minWidth = minHeight / aspectRatio + (2 * Padding);
328-
minWidth = Math.Max(Math.Max(minWidth, AbsoluteMinimumWindowWidth), lastRect.width + lastRect.position.x);
327+
minWidth = Math.Max(minWidth, AbsoluteMinimumWindowWidth);
329328

330329
// Only change the window size if the calculated size has changed
331330
if (!(Math.Abs(minHeight - this.minSize.y) > tolerance) &&
@@ -337,7 +336,6 @@ private void AdjustWindowSize()
337336
// Set the height to be the new minimumHeight
338337
Rect currentPosition = position;
339338
currentPosition.height = minHeight;
340-
currentPosition.width = minWidth;
341339

342340
position = currentPosition;
343341

0 commit comments

Comments
 (0)