GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

_wayland temp investigate
Some checks failed
Build Android / Game (Android, Release ARM64) (push) Has been cancelled
Details
Build iOS / Game (iOS, Release ARM64) (push) Has been cancelled
Details
Build Linux / Editor (Linux, Development x64) (push) Has been cancelled
Details
Build Linux / Game (Linux, Release x64) (push) Has been cancelled
Details
Build macOS / Editor (Mac, Development ARM64) (push) Has been cancelled
Details
Build macOS / Game (Mac, Release ARM64) (push) Has been cancelled
Details
Build Windows / Editor (Windows, Development x64) (push) Has been cancelled
Details
Build Windows / Game (Windows, Release x64) (push) Has been cancelled
Details
Cooker / Cook (Mac) (push) Has been cancelled
Details
Tests / Tests (Linux) (push) Has been cancelled
Details
Tests / Tests (Windows) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Ari Vuollet
2025-01-10 11:28:22 +02:00
parent 2fc6e95ec3
commit 387eb90576
12 changed files with 122 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Engine/UI/GUI/ContainerControl.cs
View File

@@ -424,7 +424,7 @@ namespace FlaxEngine.GUI
if (!IsDisposing)
{
// Arrange child controls
PerformLayout();
//PerformLayout();
}
}
@@ -454,7 +454,7 @@ namespace FlaxEngine.GUI
// Add child
_children.Add(child);
OnChildrenChanged();
//OnChildrenChanged();
}
/// <summary>
@@ -468,7 +468,7 @@ namespace FlaxEngine.GUI
// Remove child
_children.Remove(child);
OnChildrenChanged();
// OnChildrenChanged();
}
/// <summary>
@@ -679,11 +679,11 @@ namespace FlaxEngine.GUI
_containsFocus = result;
if (result)
{
OnStartContainsFocus();
//OnStartContainsFocus();
}
else
{
OnEndContainsFocus();
//OnEndContainsFocus();
}
}
}
@@ -1337,7 +1337,7 @@ namespace FlaxEngine.GUI
bool wasLayoutLocked = _isLayoutLocked;
_isLayoutLocked = true;
base.OnSizeChanged();
//base.OnSizeChanged();
// Fire event
for (int i = 0; i < _children.Count; i++)
@@ -1346,7 +1346,7 @@ namespace FlaxEngine.GUI
}
// Restore state
_isLayoutLocked = wasLayoutLocked;
//_isLayoutLocked = wasLayoutLocked;
// Arrange child controls
PerformLayout();

24
Source/Engine/UI/GUI/Control.cs
View File

@@ -122,7 +122,7 @@ namespace FlaxEngine.GUI
if (_parent == value)
return;
Defocus();
//Defocus();
Float2 oldParentSize;
if (_parent != null)
@@ -133,20 +133,20 @@ namespace FlaxEngine.GUI
else
{
oldParentSize = Float2.Zero;
ClearState();
//ClearState();
}
_parent = value;
_parent?.AddChildInternal(this);
CacheRootHandle();
OnParentChangedInternal();
/*OnParentChangedInternal();
// Check if parent size has been changed
if (_parent != null && !_parent.Size.Equals(ref oldParentSize))
{
OnParentResized();
}
}*/
}
}
@@ -461,13 +461,13 @@ namespace FlaxEngine.GUI
/// </summary>
public virtual void ClearState()
{
Defocus();
/*Defocus();
if (_isMouseOver)
OnMouseLeave();
if (_isDragOver)
OnDragLeave();
while (_touchOvers != null && _touchOvers.Count != 0)
OnTouchLeave(_touchOvers[0]);
OnTouchLeave(_touchOvers[0]);*/
}
#region Focus
@@ -1347,8 +1347,8 @@ namespace FlaxEngine.GUI
/// </summary>
protected virtual void OnSizeChanged()
{
SizeChanged?.Invoke(this);
_parent?.OnChildResized(this);
//SizeChanged?.Invoke(this);
//_parent?.OnChildResized(this);
}
/// <summary>
@@ -1422,12 +1422,12 @@ namespace FlaxEngine.GUI
/// </summary>
internal virtual void CacheRootHandle()
{
if (_root != null)
RemoveUpdateCallbacks(_root);
//if (_root != null)
// RemoveUpdateCallbacks(_root);
_root = _parent?.Root;
if (_root != null)
AddUpdateCallbacks(_root);
//if (_root != null)
// AddUpdateCallbacks(_root);
}
/// <summary>

2
Source/Engine/UI/GUI/RootControl.cs
View File

@@ -150,7 +150,7 @@ namespace FlaxEngine.GUI
Profiler.BeginEvent("RootControl.Update");
for (int i = 0; i < UpdateCallbacks.Count; i++)
{
UpdateCallbacks[i](deltaTime);
//UpdateCallbacks[i](deltaTime);
}
}
finally

1
Source/Engine/UI/GUI/Tooltip.cs
View File

@@ -56,6 +56,7 @@ namespace FlaxEngine.GUI
/// <param name="targetArea">Tooltip target area of interest.</param>
public void Show(Control target, Float2 location, Rectangle targetArea)
{
return;
if (target == null)
throw new ArgumentNullException();

20
Source/Engine/UI/GUI/WindowRootControl.cs
View File

@@ -69,7 +69,7 @@ namespace FlaxEngine.GUI
/// </summary>
public void Show()
{
_window.Show();
//_window.Show();
}
/// <summary>
@@ -77,7 +77,7 @@ namespace FlaxEngine.GUI
/// </summary>
public void Hide()
{
_window.Hide();
//_window.Hide();
}
/// <summary>
@@ -85,7 +85,7 @@ namespace FlaxEngine.GUI
/// </summary>
public void Minimize()
{
_window.Minimize();
//_window.Minimize();
}
/// <summary>
@@ -93,7 +93,7 @@ namespace FlaxEngine.GUI
/// </summary>
public void Maximize()
{
_window.Maximize();
//_window.Maximize();
}
/// <summary>
@@ -101,7 +101,7 @@ namespace FlaxEngine.GUI
/// </summary>
public void Restore()
{
_window.Restore();
//_window.Restore();
}
/// <summary>
@@ -119,7 +119,7 @@ namespace FlaxEngine.GUI
/// <param name="force">True if move to the front by force, otherwise false.</param>
public void BringToFront(bool force = false)
{
_window.BringToFront(force);
//_window.BringToFront(force);
}
/// <summary>
@@ -127,7 +127,7 @@ namespace FlaxEngine.GUI
/// </summary>
public void FlashWindow()
{
_window.FlashWindow();
//_window.FlashWindow();
}
/// <summary>
@@ -179,7 +179,7 @@ namespace FlaxEngine.GUI
_trackingControl = control;
_window.StartTrackingMouse(useMouseScreenOffset);
//_window.StartTrackingMouse(useMouseScreenOffset);
}
/// <inheritdoc />
@@ -191,7 +191,7 @@ namespace FlaxEngine.GUI
_trackingControl = null;
control.OnEndMouseCapture();
_window.EndTrackingMouse();
//_window.EndTrackingMouse();
}
}
@@ -246,7 +246,7 @@ namespace FlaxEngine.GUI
/// <inheritdoc />
public override void Focus()
{
_window.Focus();
//_window.Focus();
}
/// <inheritdoc />