Skip to content

Commit

Permalink
Issue #618: use the same new sorting icons on the query grids as well
Browse files Browse the repository at this point in the history
  • Loading branch information
@ansgarbecker
ansgarbecker committed Jul 4, 2020
1 parent 4c60093 commit 1985cd1
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 27 deletions.
8 changes: 5 additions & 3 deletions source/main.dfm
View file
Expand Up @@ -1239,7 +1239,7 @@ object MainForm: TMainForm
TreeOptions.PaintOptions = [toShowButtons, toShowDropmark, toShowHorzGridLines, toShowVertGridLines, toThemeAware, toUseBlendedImages, toAlwaysHideSelection]
TreeOptions.SelectionOptions = [toExtendedFocus, toFullRowSelect, toMultiSelect, toRightClickSelect]
WantTabs = True
OnAdvancedHeaderDraw = DataGridAdvancedHeaderDraw
OnAdvancedHeaderDraw = AnyGridAdvancedHeaderDraw
OnAfterCellPaint = AnyGridAfterCellPaint
OnBeforeCellPaint = AnyGridBeforeCellPaint
OnBeforePaint = DataGridBeforePaint
Expand All @@ -1257,7 +1257,7 @@ object MainForm: TMainForm
OnPaintText = AnyGridPaintText
OnGetNodeDataSize = AnyGridGetNodeDataSize
OnHeaderClick = DataGridHeaderClick
OnHeaderDrawQueryElements = DataGridHeaderDrawQueryElements
OnHeaderDrawQueryElements = AnyGridHeaderDrawQueryElements
OnInitNode = AnyGridInitNode
OnKeyDown = AnyGridKeyDown
OnMouseUp = AnyGridMouseUp
Expand Down Expand Up @@ -1450,7 +1450,7 @@ object MainForm: TMainForm
Header.Height = 20
Header.Images = VirtualImageListMain
Header.MainColumn = -1
Header.Options = [hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoShowHint, hoShowImages]
Header.Options = [hoColumnResize, hoDblClickResize, hoDrag, hoHotTrack, hoOwnerDraw, hoShowHint, hoShowImages]
IncrementalSearch = isAll
LineStyle = lsSolid
PopupMenu = popupDataGrid
Expand All @@ -1461,6 +1461,7 @@ object MainForm: TMainForm
TreeOptions.SelectionOptions = [toExtendedFocus, toMultiSelect, toRightClickSelect]
Visible = False
WantTabs = True
OnAdvancedHeaderDraw = AnyGridAdvancedHeaderDraw
OnAfterCellPaint = AnyGridAfterCellPaint
OnAfterPaint = AnyGridAfterPaint
OnBeforeCellPaint = AnyGridBeforeCellPaint
Expand All @@ -1479,6 +1480,7 @@ object MainForm: TMainForm
OnPaintText = AnyGridPaintText
OnGetNodeDataSize = AnyGridGetNodeDataSize
OnHeaderClick = AnyGridHeaderClick
OnHeaderDrawQueryElements = AnyGridHeaderDrawQueryElements
OnInitNode = AnyGridInitNode
OnKeyDown = AnyGridKeyDown
OnMouseUp = AnyGridMouseUp
Expand Down
59 changes: 35 additions & 24 deletions source/main.pas
View file
Expand Up @@ -1061,9 +1061,9 @@ TMainForm = class(TExtForm)
procedure actDetachDatabaseExecute(Sender: TObject);
procedure actAttachDatabaseExecute(Sender: TObject);
procedure actSynEditCompletionProposeExecute(Sender: TObject);
procedure DataGridHeaderDrawQueryElements(Sender: TVTHeader;
procedure AnyGridHeaderDrawQueryElements(Sender: TVTHeader;
var PaintInfo: THeaderPaintInfo; var Elements: THeaderPaintElements);
procedure DataGridAdvancedHeaderDraw(Sender: TVTHeader;
procedure AnyGridAdvancedHeaderDraw(Sender: TVTHeader;
var PaintInfo: THeaderPaintInfo; const Elements: THeaderPaintElements);
private
// Executable file details
Expand Down Expand Up @@ -5303,7 +5303,7 @@ procedure TMainForm.DataGridEnsureFullRows(Grid: TVirtualStringTree; SelectedOnl
end;


procedure TMainForm.DataGridHeaderDrawQueryElements(Sender: TVTHeader;
procedure TMainForm.AnyGridHeaderDrawQueryElements(Sender: TVTHeader;
var PaintInfo: THeaderPaintInfo; var Elements: THeaderPaintElements);
begin
// Tell the tree we want to paint most of the column header things ourselves
Expand All @@ -5312,26 +5312,40 @@ procedure TMainForm.DataGridHeaderDrawQueryElements(Sender: TVTHeader;
end;


procedure TMainForm.DataGridAdvancedHeaderDraw(Sender: TVTHeader;
procedure TMainForm.AnyGridAdvancedHeaderDraw(Sender: TVTHeader;
var PaintInfo: THeaderPaintInfo; const Elements: THeaderPaintElements);
var
PaintArea, TextArea, IconArea, SortArea: TRect;
SortText, ColCaption: String;
TextSpace, SortIndex, NumCharTop: Integer;
TextSpace, ColSortIndex, NumCharTop: Integer;
ColSortDirection: VirtualTrees.TSortDirection;
Size: TSize;
DC: HDC;
DrawFormat: Cardinal;
const
NumSortChars: Array of Char = ['¹','²','³','⁴','⁵','⁶','⁷','⁸','⁹','⁺'];

function GetSortIndex(Column: TVirtualTreeColumn): Integer;
procedure GetSortIndex(Column: TVirtualTreeColumn; var SortIndex: Integer; var SortDirection: VirtualTrees.TSortDirection);
var i: Integer;
begin
Result := -1;
for i:=0 to Length(DataGridSortColumns)-1 do begin
if DataGridSortColumns[i].ColumnName = PaintInfo.Column.Text then begin
Result := i;
Break;
SortIndex := -1;
if Column.Owner.Header.Treeview = DataGrid then begin
// Data grid supports multiple sorted columns
for i:=0 to Length(DataGridSortColumns)-1 do begin
if DataGridSortColumns[i].ColumnName = PaintInfo.Column.Text then begin
SortIndex := i;
if DataGridSortColumns[i].SortDirection = ORDER_ASC then
SortDirection := sdAscending
else
SortDirection := sdDescending;
Break;
end;
end;
end else begin
// We're in a query grid, supporting a single sorted column
if Column.Owner.Header.SortColumn = Column.Index then begin
SortIndex := 0;
SortDirection := Column.Owner.Header.SortDirection;
end;
end;
end;
Expand All @@ -5350,7 +5364,8 @@ procedure TMainForm.DataGridAdvancedHeaderDraw(Sender: TVTHeader;
TextArea := PaintArea;
if PaintInfo.Column.ImageIndex > -1 then
Dec(TextArea.Right, Sender.Images.Width);
if GetSortIndex(PaintInfo.Column) > -1 then
GetSortIndex(PaintInfo.Column, ColSortIndex, ColSortDirection);
if ColSortIndex > -1 then
Dec(TextArea.Right, Sender.Images.Width);

if not (coWrapCaption in PaintInfo.Column.Options) then begin
Expand All @@ -5371,18 +5386,19 @@ procedure TMainForm.DataGridAdvancedHeaderDraw(Sender: TVTHeader;
if (hpeHeaderGlyph in Elements) and (PaintInfo.Column.ImageIndex > -1) then begin
IconArea := PaintArea;
Inc(IconArea.Left, IconArea.Width - Sender.Images.Width);
if GetSortIndex(PaintInfo.Column) > -1 then
GetSortIndex(PaintInfo.Column, ColSortIndex, ColSortDirection);
if ColSortIndex > -1 then
Dec(IconArea.Left, Sender.Images.Width);
Sender.Images.Draw(PaintInfo.TargetCanvas, IconArea.Left, IconArea.Top, PaintInfo.Column.ImageIndex);
end;

// Paint sort icon and number
if hpeOverlay in Elements then begin
SortArea := PaintArea;
SortIndex := GetSortIndex(PaintInfo.Column);
if SortIndex > -1 then begin
GetSortIndex(PaintInfo.Column, ColSortIndex, ColSortDirection);
if ColSortIndex > -1 then begin
Inc(SortArea.Left, SortArea.Width - Sender.Images.Width);
if DataGridSortColumns[SortIndex].SortDirection = ORDER_ASC then begin
if ColSortDirection = sdAscending then begin
SortText := '▲';
NumCharTop := 0;
end else begin
Expand All @@ -5392,7 +5408,7 @@ procedure TMainForm.DataGridAdvancedHeaderDraw(Sender: TVTHeader;
// Paint arrow:
PaintInfo.TargetCanvas.TextOut(SortArea.Left, SortArea.Top, SortText);
// ... and superscript number right besides:
SortText := IfThen(SortIndex<9, NumSortChars[SortIndex], NumSortChars[9]);
SortText := IfThen(ColSortIndex<9, NumSortChars[ColSortIndex], NumSortChars[9]);
PaintInfo.TargetCanvas.TextOut(SortArea.Left+9, SortArea.Top+NumCharTop, SortText);
end;
end;
Expand Down Expand Up @@ -7801,17 +7817,10 @@ procedure TMainForm.AnyGridHeaderClick(Sender: TVTHeader; HitInfo: TVTHeaderHitI
Exit;
end;

// Clear sort icons
for i:=0 to Sender.Columns.Count-1 do begin
Sender.Columns[i].ImageIndex := -1;
end;

if (Sender.SortColumn <> HitInfo.Column) or (Sender.SortDirection = sdDescending) then begin
Sender.SortDirection := sdAscending;
Sender.Columns[HitInfo.Column].ImageIndex := 109;
end else if Sender.SortDirection = sdAscending then begin
Sender.SortDirection := sdDescending;
Sender.Columns[HitInfo.Column].ImageIndex := 110;
end;
Screen.Cursor := crHourglass;
Sender.SortColumn := HitInfo.Column;
Expand Down Expand Up @@ -13847,6 +13856,7 @@ constructor TResultTab.Create(AOwner: TQueryTab);
Grid.WantTabs := OrgGrid.WantTabs;
Grid.AutoScrollDelay := OrgGrid.AutoScrollDelay;
// Apply events - keep in alphabetical order for overview reasons
Grid.OnAdvancedHeaderDraw := OrgGrid.OnAdvancedHeaderDraw;
Grid.OnAfterCellPaint := OrgGrid.OnAfterCellPaint;
Grid.OnAfterPaint := OrgGrid.OnAfterPaint;
Grid.OnBeforeCellPaint := OrgGrid.OnBeforeCellPaint;
Expand All @@ -13864,6 +13874,7 @@ constructor TResultTab.Create(AOwner: TQueryTab);
Grid.OnGetNodeDataSize := OrgGrid.OnGetNodeDataSize;
Grid.OnGetText := OrgGrid.OnGetText;
Grid.OnHeaderClick := OrgGrid.OnHeaderClick;
Grid.OnHeaderDrawQueryElements := OrgGrid.OnHeaderDrawQueryElements;
Grid.OnInitNode := OrgGrid.OnInitNode;
Grid.OnKeyDown := OrgGrid.OnKeyDown;
Grid.OnMouseUp := OrgGrid.OnMouseUp;
Expand Down

0 comments on commit 1985cd1

Please sign in to comment.