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

LCL: Do not force-clear mouse capture flag on creation of TCustomEdit and TCustomComboBox, issue #40379.

Browse Source 
Fixes text selection of TEdit and TComboBox on Gtk2 widgetset.

This effectively reverts the following commits:

Commit 27d0c29fb7 (introduced long time
ago to workaround Qt* widgetsets problems, which will be fixed
separately).

Commit e4494cf4cd (workaround for Gtk2
problems caused by the first one).
This commit is contained in:
Maxim Ganetsky 2023-12-05 17:25:51 +03:00
parent ca219eca4b
commit 469e1318dd
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/include/customcombobox.inc
View File

@ -891,7 +891,6 @@ begin
inherited Create(TheOwner); inherited Create(TheOwner);
fCompStyle := csComboBox; fCompStyle := csComboBox;
ControlStyle := ControlStyle - [csCaptureMouse];
with GetControlClassDefaultSize do with GetControlClassDefaultSize do
SetInitialBounds(0, 0, CX, CY); SetInitialBounds(0, 0, CX, CY);
FItems := TStringListUTF8Fast.Create; FItems := TStringListUTF8Fast.Create;

2
lcl/include/customedit.inc
View File

@ -68,7 +68,7 @@ begin
inherited Create(AOwner); inherited Create(AOwner);
//FCompStyle is set here because TEdit inherits from this. //FCompStyle is set here because TEdit inherits from this.
//TCustomMemo also inherits from here but it's create changes fcompstyle to csMemo //TCustomMemo also inherits from here but it's create changes fcompstyle to csMemo
ControlStyle := ControlStyle - [csCaptureMouse] + [csRequiresKeyboardInput]; ControlStyle := ControlStyle + [csRequiresKeyboardInput];
FCompStyle := csEdit; FCompStyle := csEdit;
FMaxLength := 0; FMaxLength := 0;
FHideSelection := True; FHideSelection := True;

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

@ -1529,7 +1529,7 @@ begin
if not (csDesigning in ACtl.ComponentState) and if not (csDesigning in ACtl.ComponentState) and
not (csCaptureMouse in ACtl.ControlStyle) and not (csCaptureMouse in ACtl.ControlStyle) and
([ssLeft,ssRight,ssMiddle]*ShiftState <> []) and ([ssLeft,ssRight,ssMiddle]*ShiftState <> []) and
not (ACtl is TCustomForm) and not (ACtl is TScrollBar) and not (ACtl is TCustomEdit) not (ACtl is TCustomForm) and not (ACtl is TScrollBar)
and not DragManager.IsDragging then and not DragManager.IsDragging then
begin begin
if (Event^.x < 0) or (Event^.y < 0) or if (Event^.x < 0) or (Event^.y < 0) or