ギコナビ
| Revision | 721d5e04fa25c8b3e8a5e62a0def9586ecf39398 (tree) |
|---|---|
| Zeit | 2007-01-06 22:55:29 |
| Autor | h677 <h677> |
| Commiter | h677 |
マウスジェスチャーで、アクションを呼び出すとき前に、
ジェスチャーをクリアするように変更
Gesture.pas (diff) Giko.pas (diff)
gikoNavi.res (diff)| @@ -25,7 +25,6 @@ type | ||
| 25 | 25 | function CheckAction(Message: Integer; x, y: Integer): Boolean; |
| 26 | 26 | procedure AddAction(sx, sy: Integer); |
| 27 | 27 | function AddGesture(Item: string): Integer; |
| 28 | - procedure ClearGesture; | |
| 29 | 28 | function Get(Index: integer): string; |
| 30 | 29 | procedure Put(Index: integer; Item: string); |
| 31 | 30 | public |
| @@ -37,6 +36,7 @@ type | ||
| 37 | 36 | property GestureCount: Integer read GetGestureCount; |
| 38 | 37 | property Margin: Integer read FMargin write FMargin; |
| 39 | 38 | function GetGestureStr: string; |
| 39 | + procedure ClearGesture; | |
| 40 | 40 | property OnGestureStart: TNotifyEvent read FOnGestureStart write FOnGestureStart; |
| 41 | 41 | property OnGestureMove: TNotifyEvent read FOnGestureMove write FOnGestureMove; |
| 42 | 42 | property OnGestureEnd: TNotifyEvent read FOnGestureEnd write FOnGestureEnd; |
| @@ -161,9 +161,11 @@ begin | ||
| 161 | 161 | FBeginGesture := False; |
| 162 | 162 | ReleaseCapture; |
| 163 | 163 | if FGestureItemList.Count <> 0 then begin |
| 164 | - if Assigned(FOnGestureEnd) then | |
| 164 | + if Assigned(FOnGestureEnd) then begin | |
| 165 | 165 | FOnGestureEnd(Self); |
| 166 | - ClearGesture; | |
| 166 | + end else begin | |
| 167 | + ClearGesture; | |
| 168 | + end; | |
| 167 | 169 | end else begin |
| 168 | 170 | FCancelMode := True; |
| 169 | 171 | //WFX`[¶áÈ©Á½êA}EXDOWN,UPðG~ [g |
| @@ -6782,6 +6782,7 @@ var | ||
| 6782 | 6782 | Action: TAction; |
| 6783 | 6783 | begin |
| 6784 | 6784 | s := MouseGesture.GetGestureStr; |
| 6785 | + MouseGesture.ClearGesture; | |
| 6785 | 6786 | Action := GikoSys.Setting.Gestures.GetGestureAction(s); |
| 6786 | 6787 | if Action <> nil then |
| 6787 | 6788 | Action.Execute; |
sado
Fork