Skip to content

Added SetFocus method to the Window #1952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasMiz merged 3 commits into from
Apr 26, 2024
Merged

Added SetFocus method to the Window #1952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db31fe5
Added respective methods to IView and GLFW and SDL windows
mayatskiy Feb 18, 2024
1a4eea2
Added SetFocus() method to PublicAPI
mayatskiy Feb 20, 2024
bf55028
Renamed SetFocus() to Focus()
mayatskiy Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Windowing/Silk.NET.Windowing.Common/Interfaces/IView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ public interface IView : IViewProperties, IGLContextSource, IVkSurfaceSource, ID
/// </summary>
void Reset();

/// <summary>
/// Sets focus to current window.
/// </summary>
void Focus();

/// <summary>
/// Close this window.
/// </summary>
Expand Down Expand Up @@ -146,4 +151,4 @@ public interface IView : IViewProperties, IGLContextSource, IVkSurfaceSource, ID
/// <param name="onFrame">The callback to run each frame.</param>
void Run(Action onFrame);
}
}
}
1 change: 1 addition & 0 deletions src/Windowing/Silk.NET.Windowing.Common/Internals/ViewImplementationBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ protected ViewImplementationBase(ViewOptions opts)
public abstract void ContinueEvents();
public abstract Vector2D<int> PointToClient(Vector2D<int> point);
public abstract Vector2D<int> PointToScreen(Vector2D<int> point);
public abstract void Focus();
public abstract void Close();
protected abstract void RegisterCallbacks();
protected abstract void UnregisterCallbacks();
Expand Down
1 change: 1 addition & 0 deletions src/Windowing/Silk.NET.Windowing.Common/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Silk.NET.Windowing.IView.Render -> System.Action<double>?
Silk.NET.Windowing.IView.Reset() -> void
Silk.NET.Windowing.IView.Resize -> System.Action<Silk.NET.Maths.Vector2D<int>>?
Silk.NET.Windowing.IView.Run(System.Action! onFrame) -> void
Silk.NET.Windowing.IView.Focus() -> void
Silk.NET.Windowing.IView.Time.get -> double
Silk.NET.Windowing.IView.Update -> System.Action<double>?
Silk.NET.Windowing.IViewProperties
Expand Down
1 change: 1 addition & 0 deletions src/Windowing/Silk.NET.Windowing.Common/PublicAPI/netstandard2.1/PublicAPI.Shipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Silk.NET.Windowing.IView.Render -> System.Action<double>?
Silk.NET.Windowing.IView.Reset() -> void
Silk.NET.Windowing.IView.Resize -> System.Action<Silk.NET.Maths.Vector2D<int>>?
Silk.NET.Windowing.IView.Run(System.Action! onFrame) -> void
Silk.NET.Windowing.IView.Focus() -> void
Silk.NET.Windowing.IView.Time.get -> double
Silk.NET.Windowing.IView.Update -> System.Action<double>?
Silk.NET.Windowing.IViewProperties
Expand Down
5 changes: 5 additions & 0 deletions src/Windowing/Silk.NET.Windowing.Glfw/GlfwWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,11 @@ public bool TryGetProcAddress(string proc, out nint addr, int? slot = default)
return ret;
}

public override void Focus()
{
_glfw.FocusWindow(_glfwWindow);
}

public override void Close()
{
Closing?.Invoke();
Expand Down
5 changes: 5 additions & 0 deletions src/Windowing/Silk.NET.Windowing.Sdl/SdlView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,11 @@ internal void RemoveEvent(int index)
Reset();
}

public override void Focus()
{
Sdl.RaiseWindow(SdlWindow);
}

public override void Close()
{
Closing?.Invoke();
Expand Down