allow focus steal to gui on mac

This commit is contained in:
April Ayres-Griffiths 2019-04-13 18:27:22 +10:00
parent 5c094eb4ad
commit 26fd303630
10 changed files with 90 additions and 125 deletions

View File

@ -1,7 +1,7 @@
object GUIForm: TGUIForm
Left = 2255
Left = 2040
Height = 668
Top = 312
Top = 171
Width = 1014
AlphaBlendValue = 128
Caption = 'microM8 GUI'
@ -5439,14 +5439,14 @@ object GUIForm: TGUIForm
end
end
object embedPanel: TPanel
Left = 150
Left = 0
Height = 589
Top = 0
Width = 694
Width = 844
Align = alClient
BevelOuter = bvNone
ClientHeight = 589
ClientWidth = 694
ClientWidth = 844
Color = clBlack
Font.Color = clWhite
ParentColor = False
@ -5459,23 +5459,14 @@ object GUIForm: TGUIForm
Left = 0
Height = 589
Top = 0
Width = 694
Width = 844
Align = alClient
OnClick = backdropClick
OnMouseDown = FormMouseDown
OnMouseUp = FormMouseUp
Stretch = True
end
end
object log: TMemo
Left = 0
Height = 589
Top = 0
Width = 150
Align = alLeft
Lines.Strings = (
'log'
)
TabOrder = 2
end
end
object MainMenu1: TMainMenu
Images = ToolbarIcons

View File

@ -21,7 +21,6 @@ type
{ TGUIForm }
TGUIForm = class(TForm)
log: TMemo;
miDisk2WPToggle: TMenuItem;
miDisk1WPToggle: TMenuItem;
MenuItem14: TMenuItem;
@ -2540,13 +2539,13 @@ end;
procedure TGUIForm.FormMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
begin
log.Lines.Add('mouse button down at '+IntToStr(x)+', '+IntToStr(y));
//log.Lines.Add('mouse button down at '+IntToStr(x)+', '+IntToStr(y));
end;
procedure TGUIForm.FormMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
begin
log.Lines.Add('mouse button up at '+IntToStr(x)+', '+IntToStr(y));
//log.Lines.Add('mouse button up at '+IntToStr(x)+', '+IntToStr(y));
end;
procedure TGUIForm.FormResize(Sender: TObject);

View File

@ -21,8 +21,8 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/>
<TopLine Value="2349"/>
<CursorPos X="15" Y="2368"/>
<TopLine Value="2348"/>
<CursorPos X="15" Y="2367"/>
<UsageCount Value="323"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
@ -57,123 +57,123 @@
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="main.pas"/>
<Caret Line="2290" Column="18" TopLine="2282"/>
<Caret Line="903" Column="3" TopLine="892"/>
</Position1>
<Position2>
<Filename Value="main.pas"/>
<Caret Line="896" Column="3" TopLine="885"/>
<Caret Line="719" Column="92" TopLine="717"/>
</Position2>
<Position3>
<Filename Value="main.pas"/>
<Caret Line="903" Column="3" TopLine="892"/>
<Caret Line="904" Column="56" TopLine="902"/>
</Position3>
<Position4>
<Filename Value="main.pas"/>
<Caret Line="719" Column="92" TopLine="717"/>
<Caret Line="719" Column="3" TopLine="717"/>
</Position4>
<Position5>
<Filename Value="main.pas"/>
<Caret Line="904" Column="56" TopLine="902"/>
<Caret Line="721" Column="3" TopLine="719"/>
</Position5>
<Position6>
<Filename Value="main.pas"/>
<Caret Line="719" Column="3" TopLine="717"/>
<Caret Line="917" Column="3" TopLine="915"/>
</Position6>
<Position7>
<Filename Value="main.pas"/>
<Caret Line="721" Column="3" TopLine="719"/>
<Caret Line="727" Column="84" TopLine="725"/>
</Position7>
<Position8>
<Filename Value="main.pas"/>
<Caret Line="917" Column="3" TopLine="915"/>
<Caret Line="473" Column="58" TopLine="455"/>
</Position8>
<Position9>
<Filename Value="main.pas"/>
<Caret Line="727" Column="84" TopLine="725"/>
<Caret Line="9" Column="60"/>
</Position9>
<Position10>
<Filename Value="main.pas"/>
<Caret Line="473" Column="58" TopLine="455"/>
<Caret Line="557" Column="41" TopLine="533"/>
</Position10>
<Position11>
<Filename Value="main.pas"/>
<Caret Line="9" Column="60"/>
<Caret Line="2046" Column="35" TopLine="1936"/>
</Position11>
<Position12>
<Filename Value="main.pas"/>
<Caret Line="557" Column="41" TopLine="533"/>
<Caret Line="503" Column="22" TopLine="479"/>
</Position12>
<Position13>
<Filename Value="main.pas"/>
<Caret Line="2046" Column="35" TopLine="1936"/>
<Caret Line="309" Column="43" TopLine="293"/>
</Position13>
<Position14>
<Filename Value="main.pas"/>
<Caret Line="503" Column="22" TopLine="479"/>
<Caret Line="503" Column="5" TopLine="485"/>
</Position14>
<Position15>
<Filename Value="main.pas"/>
<Caret Line="309" Column="43" TopLine="293"/>
<Caret Line="508" Column="17" TopLine="486"/>
</Position15>
<Position16>
<Filename Value="main.pas"/>
<Caret Line="503" Column="5" TopLine="485"/>
<Caret Line="2362" Column="39" TopLine="2350"/>
</Position16>
<Position17>
<Filename Value="main.pas"/>
<Caret Line="508" Column="17" TopLine="486"/>
<Caret Line="2302" Column="47" TopLine="2289"/>
</Position17>
<Position18>
<Filename Value="main.pas"/>
<Caret Line="2362" Column="39" TopLine="2350"/>
<Caret Line="2362" Column="3" TopLine="2360"/>
</Position18>
<Position19>
<Filename Value="main.pas"/>
<Caret Line="2302" Column="47" TopLine="2289"/>
<Caret Line="2300" Column="44" TopLine="2289"/>
</Position19>
<Position20>
<Filename Value="main.pas"/>
<Caret Line="2362" Column="3" TopLine="2360"/>
<Caret Line="14" Column="42"/>
</Position20>
<Position21>
<Filename Value="main.pas"/>
<Caret Line="2300" Column="44" TopLine="2289"/>
<Caret Line="572" Column="37" TopLine="541"/>
</Position21>
<Position22>
<Filename Value="main.pas"/>
<Caret Line="14" Column="42"/>
<Caret Line="562" Column="29" TopLine="550"/>
</Position22>
<Position23>
<Filename Value="main.pas"/>
<Caret Line="572" Column="37" TopLine="541"/>
<Caret Line="590" Column="67" TopLine="662"/>
</Position23>
<Position24>
<Filename Value="main.pas"/>
<Caret Line="562" Column="29" TopLine="550"/>
<Caret Line="2323" Column="34" TopLine="2297"/>
</Position24>
<Position25>
<Filename Value="main.pas"/>
<Caret Line="590" Column="67" TopLine="662"/>
<Caret Line="2326" Column="34" TopLine="2300"/>
</Position25>
<Position26>
<Filename Value="main.pas"/>
<Caret Line="2323" Column="34" TopLine="2297"/>
<Caret Line="2533" Column="3" TopLine="2530"/>
</Position26>
<Position27>
<Filename Value="main.pas"/>
<Caret Line="2326" Column="34" TopLine="2300"/>
<Caret Line="2557" Column="68" TopLine="2538"/>
</Position27>
<Position28>
<Filename Value="main.pas"/>
<Caret Line="2533" Column="3" TopLine="2530"/>
<Caret Line="2352" Column="3" TopLine="2349"/>
</Position28>
<Position29>
<Filename Value="main.pas"/>
<Caret Line="2557" Column="68" TopLine="2538"/>
<Caret Line="2368" Column="15" TopLine="2349"/>
</Position29>
<Position30>
<Filename Value="main.pas"/>
<Caret Line="2352" Column="3" TopLine="2349"/>
<Caret Line="2367" Column="15" TopLine="2348"/>
</Position30>
</JumpHistory>
<RunParams>

View File

@ -1,7 +1,7 @@
object GUIForm: TGUIForm
Left = 2255
Left = 2434
Height = 668
Top = 312
Top = 239
Width = 1014
AlphaBlendValue = 128
Caption = 'microM8 GUI'
@ -5439,14 +5439,14 @@ object GUIForm: TGUIForm
end
end
object embedPanel: TPanel
Left = 150
Left = 0
Height = 589
Top = 0
Width = 694
Width = 844
Align = alClient
BevelOuter = bvNone
ClientHeight = 589
ClientWidth = 694
ClientWidth = 844
Color = clBlack
Font.Color = clWhite
ParentColor = False
@ -5459,7 +5459,7 @@ object GUIForm: TGUIForm
Left = 0
Height = 589
Top = 0
Width = 694
Width = 844
Align = alClient
OnClick = backdropClick
OnMouseDown = FormMouseDown
@ -5467,19 +5467,6 @@ object GUIForm: TGUIForm
Stretch = True
end
end
object log: TMemo
Left = 0
Height = 589
Top = 0
Width = 150
Align = alLeft
Lines.Strings = (
'log'
)
OnMouseDown = FormMouseDown
OnMouseUp = FormMouseUp
TabOrder = 2
end
end
object MainMenu1: TMainMenu
Images = ToolbarIcons

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,7 +1,7 @@
object GUIForm: TGUIForm
Left = 2255
Left = 2434
Height = 668
Top = 312
Top = 239
Width = 1014
AlphaBlendValue = 128
Caption = 'microM8 GUI'
@ -5439,14 +5439,14 @@ object GUIForm: TGUIForm
end
end
object embedPanel: TPanel
Left = 150
Left = 0
Height = 589
Top = 0
Width = 694
Width = 844
Align = alClient
BevelOuter = bvNone
ClientHeight = 589
ClientWidth = 694
ClientWidth = 844
Color = clBlack
Font.Color = clWhite
ParentColor = False
@ -5459,7 +5459,7 @@ object GUIForm: TGUIForm
Left = 0
Height = 589
Top = 0
Width = 694
Width = 844
Align = alClient
OnClick = backdropClick
OnMouseDown = FormMouseDown
@ -5467,19 +5467,6 @@ object GUIForm: TGUIForm
Stretch = True
end
end
object log: TMemo
Left = 0
Height = 589
Top = 0
Width = 150
Align = alLeft
Lines.Strings = (
'log'
)
OnMouseDown = FormMouseDown
OnMouseUp = FormMouseUp
TabOrder = 2
end
end
object MainMenu1: TMainMenu
Images = ToolbarIcons

View File

@ -21,7 +21,6 @@ type
{ TGUIForm }
TGUIForm = class(TForm)
log: TMemo;
miDisk2WPToggle: TMenuItem;
miDisk1WPToggle: TMenuItem;
MenuItem14: TMenuItem;
@ -2314,8 +2313,10 @@ begin
if GetTitleOfActiveWindow = 'microM8' then
begin
{$IFDEF WINDOWS}
if IsMouseBtnDown then
exit;
{$ENDIF}
// another hack: disable mouse buttons on refocus
SimpleGet( baseUrl + '/api/control/mouse/buttonstate/0' );
@ -2540,13 +2541,13 @@ end;
procedure TGUIForm.FormMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
begin
log.Lines.Add('mouse button down at '+IntToStr(x)+', '+IntToStr(y));
//log.Lines.Add('mouse button down at '+IntToStr(x)+', '+IntToStr(y));
end;
procedure TGUIForm.FormMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
begin
log.Lines.Add('mouse button up at '+IntToStr(x)+', '+IntToStr(y));
//log.Lines.Add('mouse button up at '+IntToStr(x)+', '+IntToStr(y));
end;
procedure TGUIForm.FormResize(Sender: TObject);

64
poc.lps
View File

@ -21,8 +21,8 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/>
<TopLine Value="2349"/>
<CursorPos X="15" Y="2368"/>
<TopLine Value="2523"/>
<CursorPos X="5" Y="2542"/>
<UsageCount Value="323"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
@ -57,123 +57,123 @@
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="main.pas"/>
<Caret Line="2290" Column="18" TopLine="2282"/>
<Caret Line="903" Column="3" TopLine="892"/>
</Position1>
<Position2>
<Filename Value="main.pas"/>
<Caret Line="896" Column="3" TopLine="885"/>
<Caret Line="719" Column="92" TopLine="717"/>
</Position2>
<Position3>
<Filename Value="main.pas"/>
<Caret Line="903" Column="3" TopLine="892"/>
<Caret Line="904" Column="56" TopLine="902"/>
</Position3>
<Position4>
<Filename Value="main.pas"/>
<Caret Line="719" Column="92" TopLine="717"/>
<Caret Line="719" Column="3" TopLine="717"/>
</Position4>
<Position5>
<Filename Value="main.pas"/>
<Caret Line="904" Column="56" TopLine="902"/>
<Caret Line="721" Column="3" TopLine="719"/>
</Position5>
<Position6>
<Filename Value="main.pas"/>
<Caret Line="719" Column="3" TopLine="717"/>
<Caret Line="917" Column="3" TopLine="915"/>
</Position6>
<Position7>
<Filename Value="main.pas"/>
<Caret Line="721" Column="3" TopLine="719"/>
<Caret Line="727" Column="84" TopLine="725"/>
</Position7>
<Position8>
<Filename Value="main.pas"/>
<Caret Line="917" Column="3" TopLine="915"/>
<Caret Line="473" Column="58" TopLine="455"/>
</Position8>
<Position9>
<Filename Value="main.pas"/>
<Caret Line="727" Column="84" TopLine="725"/>
<Caret Line="9" Column="60"/>
</Position9>
<Position10>
<Filename Value="main.pas"/>
<Caret Line="473" Column="58" TopLine="455"/>
<Caret Line="557" Column="41" TopLine="533"/>
</Position10>
<Position11>
<Filename Value="main.pas"/>
<Caret Line="9" Column="60"/>
<Caret Line="2046" Column="35" TopLine="1936"/>
</Position11>
<Position12>
<Filename Value="main.pas"/>
<Caret Line="557" Column="41" TopLine="533"/>
<Caret Line="503" Column="22" TopLine="479"/>
</Position12>
<Position13>
<Filename Value="main.pas"/>
<Caret Line="2046" Column="35" TopLine="1936"/>
<Caret Line="309" Column="43" TopLine="293"/>
</Position13>
<Position14>
<Filename Value="main.pas"/>
<Caret Line="503" Column="22" TopLine="479"/>
<Caret Line="503" Column="5" TopLine="485"/>
</Position14>
<Position15>
<Filename Value="main.pas"/>
<Caret Line="309" Column="43" TopLine="293"/>
<Caret Line="508" Column="17" TopLine="486"/>
</Position15>
<Position16>
<Filename Value="main.pas"/>
<Caret Line="503" Column="5" TopLine="485"/>
<Caret Line="2362" Column="39" TopLine="2350"/>
</Position16>
<Position17>
<Filename Value="main.pas"/>
<Caret Line="508" Column="17" TopLine="486"/>
<Caret Line="2302" Column="47" TopLine="2289"/>
</Position17>
<Position18>
<Filename Value="main.pas"/>
<Caret Line="2362" Column="39" TopLine="2350"/>
<Caret Line="2362" Column="3" TopLine="2360"/>
</Position18>
<Position19>
<Filename Value="main.pas"/>
<Caret Line="2302" Column="47" TopLine="2289"/>
<Caret Line="2300" Column="44" TopLine="2289"/>
</Position19>
<Position20>
<Filename Value="main.pas"/>
<Caret Line="2362" Column="3" TopLine="2360"/>
<Caret Line="14" Column="42"/>
</Position20>
<Position21>
<Filename Value="main.pas"/>
<Caret Line="2300" Column="44" TopLine="2289"/>
<Caret Line="572" Column="37" TopLine="541"/>
</Position21>
<Position22>
<Filename Value="main.pas"/>
<Caret Line="14" Column="42"/>
<Caret Line="562" Column="29" TopLine="550"/>
</Position22>
<Position23>
<Filename Value="main.pas"/>
<Caret Line="572" Column="37" TopLine="541"/>
<Caret Line="590" Column="67" TopLine="662"/>
</Position23>
<Position24>
<Filename Value="main.pas"/>
<Caret Line="562" Column="29" TopLine="550"/>
<Caret Line="2323" Column="34" TopLine="2297"/>
</Position24>
<Position25>
<Filename Value="main.pas"/>
<Caret Line="590" Column="67" TopLine="662"/>
<Caret Line="2326" Column="34" TopLine="2300"/>
</Position25>
<Position26>
<Filename Value="main.pas"/>
<Caret Line="2323" Column="34" TopLine="2297"/>
<Caret Line="2533" Column="3" TopLine="2530"/>
</Position26>
<Position27>
<Filename Value="main.pas"/>
<Caret Line="2326" Column="34" TopLine="2300"/>
<Caret Line="2557" Column="68" TopLine="2538"/>
</Position27>
<Position28>
<Filename Value="main.pas"/>
<Caret Line="2533" Column="3" TopLine="2530"/>
<Caret Line="2352" Column="3" TopLine="2349"/>
</Position28>
<Position29>
<Filename Value="main.pas"/>
<Caret Line="2557" Column="68" TopLine="2538"/>
<Caret Line="2368" Column="15" TopLine="2349"/>
</Position29>
<Position30>
<Filename Value="main.pas"/>
<Caret Line="2352" Column="3" TopLine="2349"/>
<Caret Line="2367" Column="15" TopLine="2348"/>
</Position30>
</JumpHistory>
<RunParams>