paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-19 18:20:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

gtk2,gtk3: gtk should always send LM_SETFOCUS before mouse messages, like Qt and Win32 does. issue #31900

Browse Source 
git-svn-id: trunk@55062 -
This commit is contained in:
zeljko 2017-05-23 15:39:42 +00:00
parent 47e4060861
commit 09f9152b29
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lcl/interfaces/gtk2/gtk2callback.inc
View File

@ -2114,12 +2114,14 @@ begin
MessI.Result:=0; MessI.Result:=0;
{always send LM_SETFOCUS first} {Gtk2 should always send LM_SETFOCUS first, as qt and win32 does. issues #24308, #31900}
if ((MessI.Msg = LM_LBUTTONDOWN) or (MessI.Msg = LM_RBUTTONDOWN) or if ((MessI.Msg = LM_LBUTTONDOWN) or (MessI.Msg = LM_RBUTTONDOWN) or
(MessI.Msg = LM_MBUTTONDOWN) or (MessI.Msg = LM_LBUTTONDBLCLK) or (MessI.Msg = LM_MBUTTONDOWN) or (MessI.Msg = LM_LBUTTONDBLCLK) or
(MessI.Msg = LM_XBUTTONDOWN)) and (MessI.Msg = LM_XBUTTONDOWN)) and
not AWinControl.Focused and AWinControl.CanFocus and not AWinControl.Focused and AWinControl.CanFocus and
not (csDesigning in AWinControl.ComponentState) and (AWinControl is TCustomEdit) then not (csDesigning in AWinControl.ComponentState) then
begin
if (AWinControl is TCustomEdit) then
begin begin
AClipText := ''; AClipText := '';
AClip := gtk_clipboard_get(GDK_SELECTION_PRIMARY); AClip := gtk_clipboard_get(GDK_SELECTION_PRIMARY);
@ -2130,6 +2132,8 @@ begin
LCLIntf.SetFocus(AWinControl.Handle); LCLIntf.SetFocus(AWinControl.Handle);
if Assigned(AClip) then if Assigned(AClip) then
gtk_clipboard_set_text(AClip, PgChar(AClipText), length(AClipText)); gtk_clipboard_set_text(AClip, PgChar(AClipText), length(AClipText));
end else
LCLIntf.SetFocus(AWinControl.Handle);
end; end;
// send the message directly to the LCL // send the message directly to the LCL

9
lcl/interfaces/gtk3/gtk3widgets.pas
View File

@ -2130,6 +2130,15 @@ begin
Msg.Msg := LM_MBUTTONUP; Msg.Msg := LM_MBUTTONUP;
end; end;
end; end;
{Issues #24308,#21900. Gtk should always send LM_SETFOCUS before LM_XXXX - mouse click}
if ((Msg.Msg = LM_LBUTTONDOWN) or (Msg.Msg = LM_RBUTTONDOWN) or
(Msg.Msg = LM_MBUTTONDOWN) or (Msg.Msg = LM_LBUTTONDBLCLK) or
(Msg.Msg = LM_XBUTTONDOWN)) and Assigned(LCLObject) and
not LCLObject.Focused and LCLObject.CanFocus and
not (csDesigning in LCLObject.ComponentState) then
LCLIntf.SetFocus(LCLObject.Handle);
{$IF DEFINED(GTK3DEBUGEVENTS) OR DEFINED(GTK3DEBUGMOUSE)} {$IF DEFINED(GTK3DEBUGEVENTS) OR DEFINED(GTK3DEBUGMOUSE)}
DebugLn('TGtk3Widget.GtkEventMouse ',dbgsName(LCLObject), DebugLn('TGtk3Widget.GtkEventMouse ',dbgsName(LCLObject),
' msg=',dbgs(msg.Msg), ' point=',dbgs(Msg.XPos),',',dbgs(Msg.YPos)); ' msg=',dbgs(msg.Msg), ' point=',dbgs(Msg.XPos),',',dbgs(Msg.YPos));