From 04e7334bd04d3e952ac3dd39a2a6ec4702bd4a1f Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Wed, 8 Jul 2020 10:35:48 +0200 Subject: [PATCH] Issue #906: disable animation for resizing columns per doubleclick, and activate Header.PopupMenu for some trees missing this menu --- source/connections.dfm | 2 +- source/insertfiles.dfm | 4 ++-- source/main.dfm | 17 +++++++++-------- source/main.pas | 1 + source/routine_editor.dfm | 3 ++- source/table_editor.dfm | 7 ++++--- source/tabletools.dfm | 3 ++- source/usermanager.dfm | 3 ++- 8 files changed, 23 insertions(+), 17 deletions(-) diff --git a/source/connections.dfm b/source/connections.dfm index 33c8cb16..bc243c40 100644 --- a/source/connections.dfm +++ b/source/connections.dfm @@ -876,7 +876,7 @@ object connform: Tconnform Align = alClient DragMode = dmAutomatic Header.AutoSizeIndex = -1 - Header.Options = [hoAutoResize, hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoAutoResize, hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] Header.PopupMenu = MainForm.popupListHeader Header.SortColumn = 0 HintMode = hmTooltip diff --git a/source/insertfiles.dfm b/source/insertfiles.dfm index 294f7692..cf8cfe85 100644 --- a/source/insertfiles.dfm +++ b/source/insertfiles.dfm @@ -103,7 +103,7 @@ object frmInsertFiles: TfrmInsertFiles EditDelay = 0 Header.AutoSizeIndex = 2 Header.Images = MainForm.VirtualImageListMain - Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoShowSortGlyphs, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoShowSortGlyphs, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] Header.PopupMenu = MainForm.popupListHeader TabOrder = 2 TreeOptions.MiscOptions = [toAcceptOLEDrop, toEditable, toFullRepaintOnResize, toGridExtensions, toInitOnSave, toToggleOnDblClick, toWheelPanning, toEditOnClick] @@ -175,7 +175,7 @@ object frmInsertFiles: TfrmInsertFiles Height = 128 Anchors = [akLeft, akTop, akRight, akBottom] Header.AutoSizeIndex = 0 - Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoHotTrack, hoShowImages, hoShowSortGlyphs, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoHotTrack, hoShowImages, hoShowSortGlyphs, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] Header.PopupMenu = MainForm.popupListHeader Header.SortColumn = 0 TabOrder = 0 diff --git a/source/main.dfm b/source/main.dfm index bcf24de4..c1b9abdb 100644 --- a/source/main.dfm +++ b/source/main.dfm @@ -423,7 +423,7 @@ object MainForm: TMainForm Height = 253 Align = alClient Header.AutoSizeIndex = 0 - Header.Options = [hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] Header.PopupMenu = popupListHeader Header.SortColumn = 0 Images = VirtualImageListMain @@ -505,7 +505,7 @@ object MainForm: TMainForm DragOperations = [] Header.AutoSizeIndex = 2 Header.Height = 20 - Header.Options = [hoAutoResize, hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoAutoResize, hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] Header.PopupMenu = popupListHeader Header.SortColumn = 0 HintMode = hmTooltip @@ -561,7 +561,7 @@ object MainForm: TMainForm DragOperations = [] Header.AutoSizeIndex = 1 Header.Height = 20 - Header.Options = [hoAutoResize, hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoAutoResize, hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] Header.PopupMenu = popupListHeader Header.SortColumn = 0 HintMode = hmTooltip @@ -630,7 +630,7 @@ object MainForm: TMainForm Align = alClient Header.AutoSizeIndex = 7 Header.Height = 20 - Header.Options = [hoAutoResize, hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoAutoResize, hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] Header.PopupMenu = popupListHeader Header.SortColumn = 0 Header.SortDirection = sdDescending @@ -788,7 +788,7 @@ object MainForm: TMainForm Align = alClient Header.AutoSizeIndex = 4 Header.Height = 20 - Header.Options = [hoAutoResize, hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoAutoResize, hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] Header.PopupMenu = popupListHeader Header.SortColumn = 1 Header.SortDirection = sdDescending @@ -858,7 +858,7 @@ object MainForm: TMainForm EditDelay = 500 Header.AutoSizeIndex = -1 Header.Height = 20 - Header.Options = [hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] Header.PopupMenu = popupListHeader Header.SortColumn = 0 HintMode = hmTooltip @@ -1229,7 +1229,7 @@ object MainForm: TMainForm Header.Height = 20 Header.Images = VirtualImageListMain Header.MainColumn = -1 - Header.Options = [hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoOwnerDraw, hoShowHint, hoShowImages, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoOwnerDraw, hoShowHint, hoShowImages, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] IncrementalSearch = isInitializedOnly LineStyle = lsSolid PopupMenu = popupDataGrid @@ -1450,7 +1450,8 @@ object MainForm: TMainForm Header.Height = 20 Header.Images = VirtualImageListMain Header.MainColumn = -1 - Header.Options = [hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoOwnerDraw, hoShowHint, hoShowImages, hoAutoResizeInclCaption] + Header.Options = [hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoOwnerDraw, hoShowHint, hoShowImages, hoDisableAnimatedResize, hoAutoResizeInclCaption] + Header.PopupMenu = popupListHeader IncrementalSearch = isAll LineStyle = lsSolid PopupMenu = popupDataGrid diff --git a/source/main.pas b/source/main.pas index e2c6184d..a8fb5ea1 100644 --- a/source/main.pas +++ b/source/main.pas @@ -13860,6 +13860,7 @@ begin Grid.EditDelay := OrgGrid.EditDelay; Grid.Font.Assign(OrgGrid.Font); Grid.Header.Options := OrgGrid.Header.Options; + Grid.Header.PopupMenu := OrgGrid.Header.PopupMenu; Grid.Header.ParentFont := OrgGrid.Header.ParentFont; Grid.Header.Images := OrgGrid.Header.Images; Grid.WantTabs := OrgGrid.WantTabs; diff --git a/source/routine_editor.dfm b/source/routine_editor.dfm index 3d453ee3..2915d4ff 100644 --- a/source/routine_editor.dfm +++ b/source/routine_editor.dfm @@ -281,7 +281,8 @@ object frmRoutineEditor: TfrmRoutineEditor EditDelay = 0 Header.AutoSizeIndex = 1 Header.MainColumn = 1 - Header.Options = [hoAutoResize, hoColumnResize, hoDblClickResize, hoDrag, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoAutoResize, hoColumnResize, hoDblClickResize, hoDrag, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] + Header.PopupMenu = MainForm.popupListHeader Images = MainForm.VirtualImageListMain NodeDataSize = 0 TabOrder = 0 diff --git a/source/table_editor.dfm b/source/table_editor.dfm index 5f8a6d79..9c5ffec0 100644 --- a/source/table_editor.dfm +++ b/source/table_editor.dfm @@ -253,7 +253,8 @@ object frmTableEditor: TfrmTableEditor DragMode = dmAutomatic EditDelay = 0 Header.AutoSizeIndex = 0 - Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoShowSortGlyphs, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoShowSortGlyphs, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] + Header.PopupMenu = MainForm.popupListHeader Images = MainForm.VirtualImageListMain PopupMenu = popupIndexes TabOrder = 1 @@ -412,7 +413,7 @@ object frmTableEditor: TfrmTableEditor Align = alClient EditDelay = 0 Header.AutoSizeIndex = 0 - Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoShowSortGlyphs, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoShowSortGlyphs, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] Header.PopupMenu = MainForm.popupListHeader Images = MainForm.VirtualImageListMain TabOrder = 1 @@ -650,7 +651,7 @@ object frmTableEditor: TfrmTableEditor DragMode = dmAutomatic EditDelay = 0 Header.AutoSizeIndex = -1 - Header.Options = [hoColumnResize, hoDblClickResize, hoDrag, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoColumnResize, hoDblClickResize, hoDrag, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] Header.PopupMenu = MainForm.popupListHeader Images = MainForm.VirtualImageListMain IncrementalSearch = isAll diff --git a/source/tabletools.dfm b/source/tabletools.dfm index 6cbb4447..f06128ee 100644 --- a/source/tabletools.dfm +++ b/source/tabletools.dfm @@ -119,7 +119,8 @@ object frmTableTools: TfrmTableTools Header.AutoSizeIndex = -1 Header.Images = MainForm.VirtualImageListMain Header.MainColumn = -1 - Header.Options = [hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] + Header.PopupMenu = MainForm.popupListHeader IncrementalSearch = isAll TabOrder = 0 TreeOptions.MiscOptions = [toAcceptOLEDrop, toFullRepaintOnResize, toGridExtensions, toInitOnSave, toToggleOnDblClick, toWheelPanning, toEditOnClick] diff --git a/source/usermanager.dfm b/source/usermanager.dfm index db7489cd..92fc2f99 100644 --- a/source/usermanager.dfm +++ b/source/usermanager.dfm @@ -109,7 +109,8 @@ object UserManagerForm: TUserManagerForm Height = 275 Align = alClient Header.AutoSizeIndex = 0 - Header.Options = [hoAutoResize, hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoAutoResizeInclCaption] + Header.Options = [hoAutoResize, hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowSortGlyphs, hoVisible, hoDisableAnimatedResize, hoAutoResizeInclCaption] + Header.PopupMenu = MainForm.popupListHeader Header.SortColumn = 0 Images = MainForm.VirtualImageListMain IncrementalSearch = isAll