ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-11 17:35:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Focused property now returns correct values. FocusedChanged event is now correctly raised.

Browse source
This commit is contained in:
the_fiddler 2009-10-18 15:11:41 +00:00
parent 590789a684
commit 76ae6999cd
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Source/OpenTK/Platform/Windows/WinGLNative.cs
View file

@ -64,6 +64,7 @@ namespace OpenTK.Platform.Windows
WindowBorder deferred_window_border; // Set to avoid changing borders during fullscreen states. WindowBorder deferred_window_border; // Set to avoid changing borders during fullscreen states.
WindowState windowState = WindowState.Normal; WindowState windowState = WindowState.Normal;
bool borderless_maximized_window_state = false; // Hack to get maximized mode with hidden border (not normally possible). bool borderless_maximized_window_state = false; // Hack to get maximized mode with hidden border (not normally possible).
bool focused;
System.Drawing.Rectangle System.Drawing.Rectangle
bounds = new System.Drawing.Rectangle(), bounds = new System.Drawing.Rectangle(),
@ -148,6 +149,16 @@ namespace OpenTK.Platform.Windows
#region Size / Move / Style events #region Size / Move / Style events
case WindowMessage.ACTIVATE: case WindowMessage.ACTIVATE:
// See http://msdn.microsoft.com/en-us/library/ms646274(VS.85).aspx (WM_ACTIVATE notification):
// wParam: The low-order word specifies whether the window is being activated or deactivated.
bool new_focused_state = Focused;
if (IntPtr.Size == 4)
focused = (wParam.ToInt32() & 0xFFFF) != 0;
else
focused = (wParam.ToInt64() & 0xFFFF) != 0;
if (new_focused_state != Focused && FocusedChanged != null)
FocusedChanged(this, EventArgs.Empty);
break; break;
case WindowMessage.ENTERMENULOOP: case WindowMessage.ENTERMENULOOP:
@ -773,13 +784,7 @@ namespace OpenTK.Platform.Windows
public bool Focused public bool Focused
{ {
get get { return focused; }
{
IntPtr focus = Functions.GetFocus();
return
(window != null && focus == window.WindowHandle) ||
(child_window != null && focus == child_window.WindowHandle);
}
} }
#endregion #endregion