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

Qt: added X11 selection lock,so we don't ask QMimeData when selection changes in case of native dialogs.fixes #16625

Browse Source 
git-svn-id: trunk@26478 -
This commit is contained in:
zeljko 2010-07-06 09:27:17 +00:00
parent 92ad550541
commit d3af90a31d
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lcl/interfaces/qt/qtobjects.pas
View File

@ -516,6 +516,7 @@ type
FClipSelectionChangedHook: QClipboard_hookH;
FSelTimer: TQtTimer; // timer for keyboard X11 selection
FSelFmtCount: Integer;
FLockX11Selection: Integer;
{$ENDIF}
FClipChanged: Boolean;
FClipBoardFormats: TStringList;
@ -544,6 +545,9 @@ type
procedure signalDataChanged; cdecl;
{$IFDEF HASX11}
procedure BeginX11SelectionLock;
procedure EndX11SelectionLock;
function InX11SelectionLock: Boolean;
procedure signalSelectionChanged; cdecl;
procedure selectionTimer;
{$ENDIF}
@ -3286,6 +3290,7 @@ begin
FClipBoardFormats.Add('foo'); // 0 is reserved
TheObject := QApplication_clipBoard;
{$IFDEF HASX11}
FLockX11Selection := 0;
FSelTimer := TQtTimer.CreateTimer(10, @selectionTimer, TheObject);
{$ENDIF}
AttachEvents;
@ -3323,6 +3328,21 @@ begin
end;
{$IFDEF HASX11}
procedure TQtClipboard.BeginX11SelectionLock;
begin
inc(FLockX11Selection);
end;
procedure TQtClipboard.EndX11SelectionLock;
begin
dec(FLockX11Selection);
end;
function TQtClipboard.InX11SelectionLock: Boolean;
begin
Result := FLockX11Selection > 0;
end;
procedure TQtClipboard.signalSelectionChanged; cdecl;
var
TempMimeData: QMimeDataH;
@ -3333,6 +3353,8 @@ begin
writeln('signalSelectionChanged() OWNER?=', QClipboard_ownsSelection(Self.clipboard),
' FOnClipBoardRequest ? ',FOnClipBoardRequest[ctPrimarySelection] <> nil);
{$ENDIF}
if InX11SelectionLock then
exit;
TempMimeData := getMimeData(QClipboardSelection);
if (TempMimeData <> nil) and
(QMimeData_hasText(TempMimeData) or QMimeData_hasHtml(TempMimeData) or

16
lcl/interfaces/qt/qtwsdialogs.pp
View File

@ -388,10 +388,18 @@ begin
Flags := 0;
if not (ofOverwritePrompt in TSaveDialog(FileDialog).Options) then
Flags := Flags or QFileDialogDontConfirmOverwrite;
QFileDialog_getSaveFileName(@ReturnText,
QWidget_parentWidget(QtFileDialog.Widget), @SaveTitle, @saveFileName,
@saveFilter, @selectedFilter, Flags);
{$IFDEF HASX11}
Clipboard.BeginX11SelectionLock;
try
{$ENDIF}
QFileDialog_getSaveFileName(@ReturnText,
QWidget_parentWidget(QtFileDialog.Widget), @SaveTitle, @saveFileName,
@saveFilter, @selectedFilter, Flags);
{$IFDEF HASX11}
finally
Clipboard.EndX11SelectionLock;
end;
{$ENDIF}
if ReturnText <> '' then
begin