レスエディタ,キー設定でマウスジェスチャーの入力がクリアされない不具合の修正

diff --git a/Editor.pas b/Editor.pas
index f8f81c2..1b135a1 100644 (file)
--- a/Editor.pas
+++ b/Editor.pas
@@ -1757,6 +1757,7 @@ var
        Action: TAction;
 begin
        s := MouseGesture.GetGestureStr;
+    MouseGesture.Clear;
        Action := GikoSys.Setting.Gestures.GetGestureAction(s);
        if Action <> nil then
                Action.Execute;

diff --git a/Gesture.pas b/Gesture.pas
index 26a7029..c94b1cd 100644 (file)
--- a/Gesture.pas
+++ b/Gesture.pas
@@ -36,7 +36,7 @@ type
                property GestureCount: Integer read GetGestureCount;
                property Margin: Integer read FMargin write FMargin;
                function GetGestureStr: string;
-               procedure ClearGesture;
+               procedure Clear;
                property OnGestureStart: TNotifyEvent read FOnGestureStart write FOnGestureStart;
                property OnGestureMove: TNotifyEvent read FOnGestureMove write FOnGestureMove;
                property OnGestureEnd: TNotifyEvent read FOnGestureEnd write FOnGestureEnd;
@@ -65,7 +65,7 @@ end;
 destructor TMouseGesture.Destroy;
 begin
        UnHook;
-       ClearGesture;
+       Clear;
        FGestureItemList.Free;
        inherited;
 end;
@@ -164,7 +164,7 @@ begin
                                        if Assigned(FOnGestureEnd) then begin
                                                FOnGestureEnd(Self);
                     end else begin
-                        ClearGesture;
+                        Clear;
                     end;
                                end else begin
                                        FCancelMode := True;
@@ -241,7 +241,7 @@ begin
 end;
 
 //\83W\83F\83X\83`\83\83\81[\82ð\83N\83\8a\83A\82·\82é
-procedure TMouseGesture.ClearGesture;
+procedure TMouseGesture.Clear;
 begin
        FGestureItemList.Clear;
 end;

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

diff --git a/KeySetting.pas b/KeySetting.pas
index e835794..eb1adf3 100644 (file)
--- a/KeySetting.pas
+++ b/KeySetting.pas
@@ -358,6 +358,7 @@ end;
 procedure TKeySettingForm.OnGestureEnd(Sender: TObject);
 begin
        GestureEdit.Text := MouseGesture.GetGestureStr;
+    MouseGesture.Clear;
 end;
 
 procedure TKeySettingForm.GestureCheckBoxClick(Sender: TObject);

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