From a12a90da550adc4b578deb96437536873c1bdc0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=BDeljan=20Rikalo?= Date: Wed, 13 Dec 2023 16:07:31 +0100 Subject: [PATCH] Qt,Qt5,Qt6: fix for hiding dragimagelist manually.issue #40644 (cherry picked from commit 228481190b8a78df5c288d5e828a9c86467278a4) --- lcl/interfaces/qt/qtwscontrols.pp | 8 ++------ lcl/interfaces/qt5/qtwscontrols.pp | 8 ++------ lcl/interfaces/qt6/qtwscontrols.pp | 8 ++------ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/lcl/interfaces/qt/qtwscontrols.pp b/lcl/interfaces/qt/qtwscontrols.pp index 5f357a89bc..b361757f84 100644 --- a/lcl/interfaces/qt/qtwscontrols.pp +++ b/lcl/interfaces/qt/qtwscontrols.pp @@ -804,12 +804,8 @@ class function TQtWSDragImageListResolution.HideDragImage( const ADragImageList: TDragImageListResolution; ALockedWindow: HWND; DoUnLock: Boolean ): Boolean; begin - Result := True; - if DoUnlock then - begin - TQtWidgetset(Widgetset).DragImageLock := False; - Result := TQtWidgetset(Widgetset).DragImageList_SetVisible(False); - end; + TQtWidgetset(Widgetset).DragImageLock := False; + Result := TQtWidgetset(Widgetset).DragImageList_SetVisible(False); end; class function TQtWSDragImageListResolution.ShowDragImage( diff --git a/lcl/interfaces/qt5/qtwscontrols.pp b/lcl/interfaces/qt5/qtwscontrols.pp index 7ceb20fbdc..937a296bd9 100644 --- a/lcl/interfaces/qt5/qtwscontrols.pp +++ b/lcl/interfaces/qt5/qtwscontrols.pp @@ -830,12 +830,8 @@ class function TQtWSDragImageListResolution.HideDragImage( const ADragImageList: TDragImageListResolution; ALockedWindow: HWND; DoUnLock: Boolean ): Boolean; begin - Result := True; - if DoUnlock then - begin - TQtWidgetset(Widgetset).DragImageLock := False; - Result := TQtWidgetset(Widgetset).DragImageList_SetVisible(False); - end; + TQtWidgetset(Widgetset).DragImageLock := False; + Result := TQtWidgetset(Widgetset).DragImageList_SetVisible(False); end; class function TQtWSDragImageListResolution.ShowDragImage( diff --git a/lcl/interfaces/qt6/qtwscontrols.pp b/lcl/interfaces/qt6/qtwscontrols.pp index 6d0ffec08b..4540a6fe02 100644 --- a/lcl/interfaces/qt6/qtwscontrols.pp +++ b/lcl/interfaces/qt6/qtwscontrols.pp @@ -828,12 +828,8 @@ class function TQtWSDragImageListResolution.HideDragImage( const ADragImageList: TDragImageListResolution; ALockedWindow: HWND; DoUnLock: Boolean ): Boolean; begin - Result := True; - if DoUnlock then - begin - TQtWidgetset(Widgetset).DragImageLock := False; - Result := TQtWidgetset(Widgetset).DragImageList_SetVisible(False); - end; + TQtWidgetset(Widgetset).DragImageLock := False; + Result := TQtWidgetset(Widgetset).DragImageList_SetVisible(False); end; class function TQtWSDragImageListResolution.ShowDragImage(