Skip to content

Commit bb9ede8

Browse files
committed
keyup to keydown
1 parent 3bdd1d3 commit bb9ede8

2 files changed

Lines changed: 6 additions & 22 deletions

File tree

FlashpointSecurePlayer/Shared.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,11 @@ public static void LogExceptionToLauncher(Exception ex) {
159159
public const int WM_DESTROY = 0x00000002;
160160
public const int WM_PAINT = 0x0000000F;
161161
public const int WM_KEYDOWN = 0x00000100;
162-
public const int WM_KEYUP = 0x00000101;
163162
public const int WM_SYSKEYDOWN = 0x00000104;
164-
public const int WM_SYSKEYUP = 0x00000105;
165163
public const int WM_MOUSEMOVE = 0x00000200;
166-
public const int WM_LBUTTONUP = 0x00000202;
167-
public const int WM_RBUTTONUP = 0x00000205;
168-
public const int WM_MBUTTONUP = 0x00000208;
164+
public const int WM_LBUTTONDOWN = 0x00000201;
165+
public const int WM_RBUTTONDOWN = 0x00000204;
166+
public const int WM_MBUTTONDOWN = 0x00000207;
169167
public const int WM_XBUTTONUP = 0x0000020C;
170168
public const int WM_PARENTNOTIFY = 0x00000210;
171169

FlashpointSecurePlayer/WebBrowserMode.cs

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,6 @@ private class MessageFilter : IMessageFilter {
230230
private readonly EventHandler back;
231231
private readonly EventHandler forward;
232232

233-
public bool ProcessedCmdKeyFullscreen { get; set; } = false;
234-
235233
public MessageFilter(EventHandler stopExitFullscreenLabelTimer, EventHandler back, EventHandler forward) {
236234
this.stopExitFullscreenLabelTimer = stopExitFullscreenLabelTimer;
237235
this.back = back;
@@ -278,17 +276,9 @@ public bool PreFilterMessage(ref Message m) {
278276
switch (m.Msg) {
279277
case WM_KEYDOWN:
280278
case WM_SYSKEYDOWN:
281-
ProcessedCmdKeyFullscreen = false;
282-
return false;
283-
case WM_KEYUP:
284-
case WM_SYSKEYUP:
285-
if (!ProcessedCmdKeyFullscreen) {
286-
OnStopExitFullscreenLabelTimer(EventArgs.Empty);
287-
}
288-
return false;
289-
case WM_LBUTTONUP:
290-
case WM_RBUTTONUP:
291-
case WM_MBUTTONUP:
279+
case WM_LBUTTONDOWN:
280+
case WM_RBUTTONDOWN:
281+
case WM_MBUTTONDOWN:
292282
OnStopExitFullscreenLabelTimer(EventArgs.Empty);
293283
return false;
294284
case WM_XBUTTONUP:
@@ -1027,10 +1017,6 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData) {
10271017
return true;
10281018
case Keys.F11:
10291019
case Keys.Alt | Keys.Enter:
1030-
if (messageFilter != null) {
1031-
messageFilter.ProcessedCmdKeyFullscreen = true;
1032-
}
1033-
10341020
BrowserFullscreen();
10351021
return true;
10361022
}

0 commit comments

Comments
 (0)