瀏覽代碼

* Use multiple buttons, correct code

Michaël Van Canneyt 1 年之前
父節點
當前提交
7c0509cabf
共有 1 個文件被更改,包括 7 次插入15 次删除
  1. 7 15
      src/lcl/fresnel.lcl.pas

+ 7 - 15
src/lcl/fresnel.lcl.pas

@@ -243,28 +243,20 @@ end;
 
 
 class procedure TLCLWSForm.InitMouseXYEvent(out EvtInit: TFresnelMouseEventInit;
 class procedure TLCLWSForm.InitMouseXYEvent(out EvtInit: TFresnelMouseEventInit;
   Shift: TShiftState; X, Y: Integer; Button: Controls.TMouseButton);
   Shift: TShiftState; X, Y: Integer; Button: Controls.TMouseButton);
+
 begin
 begin
   EvtInit:=Default(TFresnelMouseEventInit);
   EvtInit:=Default(TFresnelMouseEventInit);
-
-  case Button of
-    mbLeft: EvtInit.Button:=mbMain;
-    mbRight: EvtInit.Button:=mbSecond;
-    mbMiddle: EvtInit.Button:=mbAux;
-    mbExtra1: EvtInit.Button:=mbFourth;
-    mbExtra2: EvtInit.Button:=mbFifth;
-  end;
-
+  evtInit.Button:=Button;
   if ssLeft in Shift then
   if ssLeft in Shift then
-    Include(EvtInit.Buttons,mbMain);
+    Include(EvtInit.Buttons,mbLeft);
   if ssMiddle in Shift then
   if ssMiddle in Shift then
-    Include(EvtInit.Buttons,mbAux);
+    Include(EvtInit.Buttons,mbMiddle);
   if ssRight in Shift then
   if ssRight in Shift then
-    Include(EvtInit.Buttons,mbSecond);
+    Include(EvtInit.Buttons,mbRight);
   if ssExtra1 in Shift then
   if ssExtra1 in Shift then
-    Include(EvtInit.Buttons,mbFourth);
+    Include(EvtInit.Buttons,mbExtra1);
   if ssExtra2 in Shift then
   if ssExtra2 in Shift then
-    Include(EvtInit.Buttons,mbFifth);
-
+    Include(EvtInit.Buttons,mbExtra2);
   EvtInit.ScreenPos.SetLocation(Controls.Mouse.CursorPos);
   EvtInit.ScreenPos.SetLocation(Controls.Mouse.CursorPos);
   EvtInit.PagePos.X:=X;
   EvtInit.PagePos.X:=X;
   EvtInit.PagePos.Y:=Y;
   EvtInit.PagePos.Y:=Y;