paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-23 17:28:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

OI: Don't cover PopupMenu with a hint. Issue #28365, patch from Péter Gábor.

Browse Source 
git-svn-id: trunk@49482 -
This commit is contained in:
juha 2015-07-01 09:24:11 +00:00
parent 2d401fe45a
commit 3c9da5e47b
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/ideintf/objectinspector.lfm
View File

@ -72,6 +72,7 @@ object ObjectInspectorDlg: TObjectInspectorDlg
end end
object MainPopupMenu: TPopupMenu object MainPopupMenu: TPopupMenu
OnPopup = OnMainPopupMenuPopup OnPopup = OnMainPopupMenuPopup
OnClose = MainPopupMenuClose
left = 32 left = 32
top = 64 top = 64
end end

12
components/ideintf/objectinspector.pp
View File

@ -624,6 +624,7 @@ type
procedure ComponentTreeGetNodeImageIndex(APersistent: TPersistent; var AIndex: integer); procedure ComponentTreeGetNodeImageIndex(APersistent: TPersistent; var AIndex: integer);
procedure ComponentTreeKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure ComponentTreeKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure ComponentTreeSelectionChanged(Sender: TObject); procedure ComponentTreeSelectionChanged(Sender: TObject);
procedure MainPopupMenuClose(Sender: TObject);
procedure OnGridKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure OnGridKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure OnGridKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState); procedure OnGridKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure OnGridDblClick(Sender: TObject); procedure OnGridDblClick(Sender: TObject);
@ -650,6 +651,7 @@ type
procedure DoUpdateRestricted; procedure DoUpdateRestricted;
procedure DoViewRestricted; procedure DoViewRestricted;
private private
StateOfHintsOnMainPopupMenu:Boolean;
FFavorites: TOIFavoriteProperties; FFavorites: TOIFavoriteProperties;
FInfoBoxHeight: integer; FInfoBoxHeight: integer;
FOnPropertyHint: TOIPropertyHint; FOnPropertyHint: TOIPropertyHint;
@ -4491,6 +4493,11 @@ begin
FOnSelectPersistentsInOI(Self); FOnSelectPersistentsInOI(Self);
end; end;
procedure TObjectInspectorDlg.MainPopupMenuClose(Sender: TObject);
begin
if StateOfHintsOnMainPopupMenu then OnShowHintPopupMenuItemClick(nil);
end;
procedure TObjectInspectorDlg.OnGridKeyDown(Sender: TObject; var Key: Word; procedure TObjectInspectorDlg.OnGridKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState); Shift: TShiftState);
var var
@ -5296,10 +5303,15 @@ var
b, AtLeastOneComp, CanChangeClass, HasParentCandidates: Boolean; b, AtLeastOneComp, CanChangeClass, HasParentCandidates: Boolean;
CurRow: TOIPropertyGridRow; CurRow: TOIPropertyGridRow;
Persistent: TPersistent; Persistent: TPersistent;
Page: TObjectInspectorPage;
begin begin
RemovePropertyEditorMenuItems; RemovePropertyEditorMenuItems;
RemoveComponentEditorMenuItems; RemoveComponentEditorMenuItems;
ShowHintsPopupMenuItem.Checked := PropertyGrid.ShowHint; ShowHintsPopupMenuItem.Checked := PropertyGrid.ShowHint;
StateOfHintsOnMainPopupMenu:=PropertyGrid.ShowHint;
for Page := Low(TObjectInspectorPage) to High(TObjectInspectorPage) do
if GridControl[Page] <> nil then
GridControl[Page].ShowHint := False;
Persistent := GetSelectedPersistent; Persistent := GetSelectedPersistent;
AtLeastOneComp := False; AtLeastOneComp := False;
CanChangeClass := False; CanChangeClass := False;