マウスジェスチャーで、アクションを呼び出すとき前に、

ジェスチャーをクリアするように変更

diff --git a/Gesture.pas b/Gesture.pas
index 5d649ff..26a7029 100644 (file)
--- a/Gesture.pas
+++ b/Gesture.pas
@@ -25,7 +25,6 @@ type
                function CheckAction(Message: Integer; x, y: Integer): Boolean;
                procedure AddAction(sx, sy: Integer);
                function AddGesture(Item: string): Integer;
-               procedure ClearGesture;
                function Get(Index: integer): string;
                procedure Put(Index: integer; Item: string);
        public
@@ -37,6 +36,7 @@ type
                property GestureCount: Integer read GetGestureCount;
                property Margin: Integer read FMargin write FMargin;
                function GetGestureStr: string;
+               procedure ClearGesture;
                property OnGestureStart: TNotifyEvent read FOnGestureStart write FOnGestureStart;
                property OnGestureMove: TNotifyEvent read FOnGestureMove write FOnGestureMove;
                property OnGestureEnd: TNotifyEvent read FOnGestureEnd write FOnGestureEnd;
@@ -161,9 +161,11 @@ begin
                                FBeginGesture := False;
                                ReleaseCapture;
                                if FGestureItemList.Count <> 0 then begin
-                                       if Assigned(FOnGestureEnd) then
+                                       if Assigned(FOnGestureEnd) then begin
                                                FOnGestureEnd(Self);
-                                       ClearGesture;
+                    end else begin
+                        ClearGesture;
+                    end;
                                end else begin
                                        FCancelMode := True;
                                        //\83W\83F\83X\83`\83\83\81[\82¶\82á\82È\82©\82Á\82½\8fê\8d\87\81A\83}\83E\83XDOWN,UP\82ð\83G\83~\83\85\83\8c\81[\83g

diff --git a/Giko.pas b/Giko.pas
index 1ad021d..eafbe6e 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -6782,6 +6782,7 @@ var
        Action: TAction;
 begin
        s := MouseGesture.GetGestureStr;
+    MouseGesture.ClearGesture;
        Action := GikoSys.Setting.Gestures.GetGestureAction(s);
        if Action <> nil then
                Action.Execute;

diff --git a/gikoNavi.res b/gikoNavi.res
index a88795a..e3f4f9b 100644 (file)
Binary files a/gikoNavi.res and b/gikoNavi.res differ