diff --git a/ide/frames/editor_keymapping_options.lfm b/ide/frames/editor_keymapping_options.lfm index b2b4b30f8a..6b77211c01 100644 --- a/ide/frames/editor_keymapping_options.lfm +++ b/ide/frames/editor_keymapping_options.lfm @@ -148,8 +148,6 @@ object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame ClientWidth = 475 TabOrder = 5 object ConflictsTreeView: TTreeView - AnchorSideTop.Control = KeyMapSplitter - AnchorSideTop.Side = asrBottom Left = 0 Height = 93 Top = 253 diff --git a/ide/frames/editor_keymapping_options.pas b/ide/frames/editor_keymapping_options.pas index 2914fada1a..04adb607d5 100644 --- a/ide/frames/editor_keymapping_options.pas +++ b/ide/frames/editor_keymapping_options.pas @@ -592,7 +592,7 @@ var if (ShortCut1.Key2=VK_UNKNOWN) or (ShortCut2.Key2=VK_UNKNOWN) or ((ShortCut1.Key2=ShortCut2.Key2) and (ShortCut1.Shift2=ShortCut2.Shift2)) then begin - // conflict found + // conflict found, add node with a sub node for each key inc(ConflictCount); ConflictNode:=ConflictsTreeView.Items.Add(nil,srkmConflic+IntToStr(ConflictCount)); ConflictNode.ImageIndex:=imgKeyItem;