paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-04 07:00:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed mouse enter/leave for TSpeedButton

Browse Source 
git-svn-id: trunk@5676 -
This commit is contained in:
mattias 2004-07-13 17:47:15 +00:00
parent 2a4f175ec4
commit 2182064a3a
2 changed files with 17 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/buttons.pp
View File

@ -238,7 +238,6 @@ type
FTransparent : Boolean;
function GetGlyph : TBitmap;
procedure UpdateExclusive;
procedure UpdateTracking;
procedure SetAllowAllUp(Value: Boolean);
procedure SetGlyph(Value: TBitmap);
procedure SetLayout(const Value: TButtonLayout);
@ -344,6 +343,9 @@ end.
{ =============================================================================
$Log$
Revision 1.73 2004/07/13 17:47:14 mattias
fixed mouse enter/leave for TSpeedButton
Revision 1.72 2004/07/13 10:34:15 mattias
fixed lcl package unit file name checklist.pas

50
lcl/include/speedbutton.inc
View File

@ -98,10 +98,12 @@ end;
procedure TSpeedButton.SetDown(Value : Boolean);
var
OldState: TButtonState;
OldDown: Boolean;
begin
if FGroupIndex = 0 then Value:= false;
if FDown <> Value then begin
if FDown and not FAllowAllUp then Exit;
OldDown:=FDown;
FDown := Value;
OldState := fState;
if FDown then begin
@ -109,8 +111,7 @@ begin
end else begin
FState := bsUp;
end;
if OldState<>FState then
Invalidate;
if (OldDown<>FDown) or (OldState<>FState) then Invalidate;
if Value then UpdateExclusive;
end;
end;
@ -505,26 +506,6 @@ begin
inherited Paint;
end;
{------------------------------------------------------------------------------
Method: TSpeedButton.UpdateTracking
Params: none
Returns: nothing
------------------------------------------------------------------------------}
procedure TSpeedButton.UpdateTracking;
var
P : TPoint;
begin
if FFlat and Enabled
then begin
GetCursorPos(p);
FMouseInControl := (FindControlAtPosition(P, True) <> Self);
if FMouseInControl
then Perform(CM_MOUSELEAVE,0,0)
else Perform(CM_MOUSEENTER,0,0);
end;
end;
{------------------------------------------------------------------------------
Method: TSpeedButton.MouseDown
Params: Button:
@ -588,11 +569,6 @@ begin
FState := NewState;
Invalidate;
end;
end
else begin
if not FMouseInControl then begin
UpdateTracking;
end;
end;
end;
@ -606,23 +582,22 @@ end;
------------------------------------------------------------------------------}
procedure TSpeedButton.MouseUp(Button: TMouseButton; Shift: TShiftState;
X, Y: Integer);
var
OldState: TButtonState;
begin
if not (csDesigning in ComponentState) and FDragging
then begin
FDragging := False;
OldState:=FState;
if FGroupIndex = 0
then begin
FState := bsUp;
// FMouseInControl := False;
if not (FState in [bsExclusive, bsDown]) then
Invalidate;
if OldState<>FState then Invalidate;
end
else begin
SetDown(not FDown);
if FDown then Invalidate;
end;
//UpdateTracking;
end;
inherited MouseUp(Button, Shift, X, Y);
end;
@ -651,8 +626,10 @@ procedure TSpeedButton.SetTransparent(const Value : boolean);
begin
if Value <> FTransparent then begin
FTransparent:= Value;
if Value then ControlStyle:= ControlStyle + [csOpaque]
else ControlStyle:= ControlStyle - [csOpaque];
if Value then
ControlStyle:= ControlStyle + [csOpaque]
else
ControlStyle:= ControlStyle - [csOpaque];
Invalidate;
end;
end;
@ -693,8 +670,6 @@ end;
procedure TSpeedButton.CMEnabledChanged(var Message: TLMEssage);
Begin
//Should create a new glyph based on the new state
//UpdateTracking;
Invalidate;
end;
@ -786,6 +761,9 @@ end;
{ =============================================================================
$Log$
Revision 1.58 2004/07/13 17:47:15 mattias
fixed mouse enter/leave for TSpeedButton
Revision 1.57 2004/06/28 20:03:33 mattias
fixed TGtkWidgetSet.DrawFrameControl