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

IdeIntf: Allow F12 and other hotkeys in Object Inspector when the selection Combobox is active. Issue #29335, patch from ptvs.

Browse Source 
git-svn-id: trunk@60745 -
This commit is contained in:
juha 2019-03-22 09:36:22 +00:00
parent f33d1bb9fb
commit 3bb6b19392
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/ideintf/objectinspector.lfm
View File

@ -3,16 +3,20 @@ object ObjectInspectorDlg: TObjectInspectorDlg
Height = 818 Height = 818
Top = 62 Top = 62
Width = 293 Width = 293
HorzScrollBar.Page = 191
HorzScrollBar.Range = 191
VertScrollBar.Page = 240
VertScrollBar.Range = 240
BorderStyle = bsSizeToolWin BorderStyle = bsSizeToolWin
Caption = 'ObjectInspectorDlg' Caption = 'ObjectInspectorDlg'
ClientHeight = 818 ClientHeight = 818
ClientWidth = 293 ClientWidth = 293
KeyPreview = True KeyPreview = True
LCLVersion = '1.9.0.0' LCLVersion = '2.1.0.0'
object StatusBar: TStatusBar object StatusBar: TStatusBar
Left = 0 Left = 0
Height = 23 Height = 21
Top = 795 Top = 797
Width = 293 Width = 293
Panels = < Panels = <
item item
@ -24,23 +28,23 @@ object ObjectInspectorDlg: TObjectInspectorDlg
end end
object AvailPersistentComboBox: TComboBox object AvailPersistentComboBox: TComboBox
Left = 0 Left = 0
Height = 23 Height = 35
Top = 0 Top = 0
Width = 293 Width = 293
Align = alTop Align = alTop
ItemHeight = 15 ItemHeight = 0
OnCloseUp = AvailComboBoxCloseUp OnCloseUp = AvailComboBoxCloseUp
Style = csDropDownList Style = csDropDownList
TabOrder = 0 TabOrder = 0
end end
object PnlClient: TPanel object PnlClient: TPanel
Left = 0 Left = 0
Height = 772 Height = 762
Top = 23 Top = 35
Width = 293 Width = 293
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 772 ClientHeight = 762
ClientWidth = 293 ClientWidth = 293
TabOrder = 2 TabOrder = 2
object ComponentPanel: TPanel object ComponentPanel: TPanel
@ -58,10 +62,10 @@ object ObjectInspectorDlg: TObjectInspectorDlg
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = CompFilterLabel AnchorSideTop.Control = CompFilterLabel
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 77 Left = 88
Height = 23 Height = 25
Top = 3 Top = 4
Width = 213 Width = 202
ButtonWidth = 23 ButtonWidth = 23
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 5 BorderSpacing.Left = 5
@ -71,9 +75,9 @@ object ObjectInspectorDlg: TObjectInspectorDlg
end end
object CompFilterLabel: TLabel object CompFilterLabel: TLabel
Left = 3 Left = 3
Height = 15 Height = 19
Top = 7 Top = 7
Width = 69 Width = 80
Caption = 'Co&mponents' Caption = 'Co&mponents'
FocusControl = CompFilterEdit FocusControl = CompFilterEdit
ParentColor = False ParentColor = False
@ -83,7 +87,7 @@ object ObjectInspectorDlg: TObjectInspectorDlg
object MainPopupMenu: TPopupMenu object MainPopupMenu: TPopupMenu
OnPopup = MainPopupMenuPopup OnPopup = MainPopupMenuPopup
OnClose = MainPopupMenuClose OnClose = MainPopupMenuClose
Left = 32 left = 32
Top = 64 top = 64
end end
end end

6
components/ideintf/objectinspector.pp
View File

@ -5057,12 +5057,8 @@ begin
ShowNextPage(1); ShowNextPage(1);
end; end;
//Allow combobox navigation while it has focus
if not Handled then
Handled := AvailPersistentComboBox.Focused;
//CTRL-ArrowDown will dropdown the component combobox //CTRL-ArrowDown will dropdown the component combobox
if (not Handled) and (Key=VK_DOWN) and (ssCtrl in Shift) then if (not Handled) and ((Key=VK_DOWN) or (Key=VK_UP)) and (ssCtrl in Shift) then
begin begin
Handled := true; Handled := true;
if AvailPersistentComboBox.Canfocus then if AvailPersistentComboBox.Canfocus then