paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-23 09:20:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 47339 #8dcc70cd3b from trunk:

Browse Source 
Qt: fixed LM_CONTEXTMENU event in case of TQtCustomControl, when eg. form.PopupMenu is assigned, and control.PopupMenu=nil.
........

git-svn-id: branches/fixes_1_4@47361 -
This commit is contained in:
maxim 2015-01-12 21:48:46 +00:00
parent 811a1e1a3f
commit 0c5af88a2d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lcl/interfaces/qt/qtwidgets.pas
View File

@ -4226,7 +4226,10 @@ begin
MousePos := QContextMenuEvent_globalPos(QContextMenuEventH(Event))^;
Msg.Msg := LM_CONTEXTMENU;
Msg.hWnd := HWND(Self);
if FOwner <> nil then
Msg.hWnd := HWND(FOwner)
else
Msg.hWnd := HWND(Self);
if QContextMenuEvent_reason(QContextMenuEventH(Event)) = QContextMenuEventKeyboard then
begin
Msg.XPos := -1;
@ -4247,6 +4250,10 @@ begin
if Assigned(LCLObject.PopupMenu) then
QEvent_ignore(Event);
SetNoMousePropagation(QWidgetH(Sender), False);
if (FOwner <> nil) and
((FChildOfComplexWidget = ccwCustomControl) or
(FChildOfComplexWidget = ccwScrollingWinControl)) then
SetNoMousePropagation(FOwner.Widget, False);
end;
if Result and (csDesigning in LCLObject.ComponentState) then