opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 11:17:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert r1870, a no longer working fix for VirtualTrees malfunctioning cell focussing. Was gladly fixed in VirtualTree itself. Fixes issue #1052.

Browse Source
This commit is contained in:
Ansgar Becker
2009-03-14 07:12:14 +00:00
parent 1980f92cb1
commit bcf44ff376
2 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/main.dfm
View File

@ -1273,7 +1273,6 @@ object MainForm: TMainForm
LineStyle = lsSolid LineStyle = lsSolid
PopupMenu = popupDataGrid PopupMenu = popupDataGrid
TabOrder = 2 TabOrder = 2
TreeOptions.AutoOptions = [toAutoDropExpand, toAutoScrollOnExpand, toAutoTristateTracking, toAutoDeleteMovedNodes, toDisableAutoscrollOnFocus, toDisableAutoscrollOnEdit]
TreeOptions.MiscOptions = [toAcceptOLEDrop, toEditable, toFullRepaintOnResize, toGridExtensions, toInitOnSave, toToggleOnDblClick, toWheelPanning] TreeOptions.MiscOptions = [toAcceptOLEDrop, toEditable, toFullRepaintOnResize, toGridExtensions, toInitOnSave, toToggleOnDblClick, toWheelPanning]
TreeOptions.PaintOptions = [toShowButtons, toShowDropmark, toShowHorzGridLines, toShowVertGridLines, toThemeAware, toUseBlendedImages, toAlwaysHideSelection] TreeOptions.PaintOptions = [toShowButtons, toShowDropmark, toShowHorzGridLines, toShowVertGridLines, toThemeAware, toUseBlendedImages, toAlwaysHideSelection]
TreeOptions.SelectionOptions = [toExtendedFocus, toMultiSelect, toRightClickSelect] TreeOptions.SelectionOptions = [toExtendedFocus, toMultiSelect, toRightClickSelect]
@ -1433,13 +1432,12 @@ object MainForm: TMainForm
LineStyle = lsSolid LineStyle = lsSolid
PopupMenu = popupResultGrid PopupMenu = popupResultGrid
TabOrder = 1 TabOrder = 1
TreeOptions.AutoOptions = [toAutoDropExpand, toAutoScrollOnExpand, toAutoTristateTracking, toAutoDeleteMovedNodes, toDisableAutoscrollOnFocus, toDisableAutoscrollOnEdit]
TreeOptions.MiscOptions = [toAcceptOLEDrop, toEditable, toFullRepaintOnResize, toGridExtensions, toInitOnSave, toToggleOnDblClick, toWheelPanning] TreeOptions.MiscOptions = [toAcceptOLEDrop, toEditable, toFullRepaintOnResize, toGridExtensions, toInitOnSave, toToggleOnDblClick, toWheelPanning]
TreeOptions.PaintOptions = [toShowButtons, toShowDropmark, toShowHorzGridLines, toShowVertGridLines, toThemeAware, toUseBlendedImages, toAlwaysHideSelection] TreeOptions.PaintOptions = [toShowButtons, toShowDropmark, toShowHorzGridLines, toShowVertGridLines, toThemeAware, toUseBlendedImages, toAlwaysHideSelection]
TreeOptions.SelectionOptions = [toExtendedFocus, toMultiSelect, toRightClickSelect] TreeOptions.SelectionOptions = [toExtendedFocus, toMultiSelect, toRightClickSelect]
WantTabs = True WantTabs = True
OnBeforeCellPaint = GridBeforeCellPaint OnBeforeCellPaint = GridBeforeCellPaint
OnFocusChanging = QueryGridFocusChanging OnFocusChanged = QueryGridFocusChanged
OnGetText = GridGetText OnGetText = GridGetText
OnPaintText = GridPaintText OnPaintText = GridPaintText
OnKeyDown = GridKeyDown OnKeyDown = GridKeyDown

31
source/main.pas
View File

@ -720,9 +720,7 @@ type
procedure popupDataViewPopup(Sender: TObject); procedure popupDataViewPopup(Sender: TObject);
procedure menuViewDefaultClick(Sender: TObject); procedure menuViewDefaultClick(Sender: TObject);
procedure menuViewSaveClick(Sender: TObject); procedure menuViewSaveClick(Sender: TObject);
procedure QueryGridFocusChanging(Sender: TBaseVirtualTree; OldNode, procedure QueryGridFocusChanged(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex);
NewNode: PVirtualNode; OldColumn, NewColumn: TColumnIndex;
var Allowed: Boolean);
procedure pnlQueryHelpersCanResize(Sender: TObject; var NewWidth, procedure pnlQueryHelpersCanResize(Sender: TObject; var NewWidth,
NewHeight: Integer; var Resize: Boolean); NewHeight: Integer; var Resize: Boolean);
procedure pnlQueryMemoCanResize(Sender: TObject; var NewWidth, procedure pnlQueryMemoCanResize(Sender: TObject; var NewWidth,
@ -795,7 +793,6 @@ type
function GetSelTableColumns: TDataset; function GetSelTableColumns: TDataset;
function GetSelTableKeys: TDataset; function GetSelTableKeys: TDataset;
procedure AutoCalcColWidths(Tree: TVirtualStringTree; PrevLayout: Widestrings.TWideStringlist = nil); procedure AutoCalcColWidths(Tree: TVirtualStringTree; PrevLayout: Widestrings.TWideStringlist = nil);
procedure FocusGridCol(Grid: TBaseVirtualTree; Column: TColumnIndex);
public public
cancelling: Boolean; cancelling: Boolean;
virtualDesktopName: string; virtualDesktopName: string;
@ -7982,8 +7979,6 @@ begin
Allowed := DataGridPostUpdateOrInsert(OldNode) Allowed := DataGridPostUpdateOrInsert(OldNode)
else else
Allowed := True; Allowed := True;
if Allowed and (OldColumn <> NewColumn) and (NewColumn <> -1) then
FocusGridCol(Sender, NewColumn);
end; end;
@ -8735,34 +8730,12 @@ begin
end; end;
procedure TMainForm.QueryGridFocusChanging(Sender: TBaseVirtualTree; OldNode, procedure TMainForm.QueryGridFocusChanged(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex);
NewNode: PVirtualNode; OldColumn, NewColumn: TColumnIndex;
var Allowed: Boolean);
begin begin
if OldColumn <> NewColumn then
FocusGridCol(Sender, NewColumn);
ValidateControls; ValidateControls;
end; end;
procedure TMainForm.FocusGridCol(Grid: TBaseVirtualTree; Column: TColumnIndex);
var
g: TVirtualStringTree;
MinX, MaxX, i: Integer;
begin
g := Grid as TVirtualStringTree;
MinX := 0;
for i:=0 to Column do
MinX := MinX + g.Header.Columns[i].Width;
MaxX := -(MinX - g.Header.Columns[Column].Width);
MinX := -(MinX - g.Width + 20); // Assume 20px for vertical scrollbar.
if g.OffsetX > MinX then
g.OffsetX := MinX
else if g.OffsetX < MaxX then
g.OffsetX := MaxX;
end;
procedure TMainForm.pnlQueryHelpersCanResize(Sender: TObject; var NewWidth, procedure TMainForm.pnlQueryHelpersCanResize(Sender: TObject; var NewWidth,
NewHeight: Integer; var Resize: Boolean); NewHeight: Integer; var Resize: Boolean);
begin begin