opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2026-03-13 09:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Only draw the focused grid cell using highlight fg/bg colors if multiple rows are selected.

Browse Source
This commit is contained in:
Ansgar Becker
2008-10-21 18:56:38 +00:00
parent f273b10a79
commit 3596975672
2 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/childwin.dfm
View File

@@ -957,7 +957,7 @@ object MDIChild: TMDIChild
TabOrder = 2
TreeOptions.AutoOptions = [toAutoDropExpand, toAutoScrollOnExpand, toAutoTristateTracking, toAutoDeleteMovedNodes, toDisableAutoscrollOnFocus, toDisableAutoscrollOnEdit]
TreeOptions.MiscOptions = [toAcceptOLEDrop, toEditable, toFullRepaintOnResize, toGridExtensions, toInitOnSave, toToggleOnDblClick, toWheelPanning]
TreeOptions.PaintOptions = [toShowButtons, toShowDropmark, toShowHorzGridLines, toShowVertGridLines, toThemeAware, toUseBlendedImages]
TreeOptions.PaintOptions = [toShowButtons, toShowDropmark, toShowHorzGridLines, toShowVertGridLines, toThemeAware, toUseBlendedImages, toAlwaysHideSelection]
TreeOptions.SelectionOptions = [toExtendedFocus, toMultiSelect, toRightClickSelect]
WantTabs = True
OnAfterCellPaint = DataGridAfterCellPaint
@@ -968,7 +968,6 @@ object MDIChild: TMDIChild
OnEditCancelled = DataGridEditCancelled
OnEdited = DataGridEdited
OnEditing = DataGridEditing
OnFocusChanged = GridFocusChanged
OnFocusChanging = DataGridFocusChanging
OnGetText = GridGetText
OnPaintText = GridPaintText
@@ -1154,11 +1153,10 @@ object MDIChild: TMDIChild
TabOrder = 2
TreeOptions.AutoOptions = [toAutoDropExpand, toAutoScrollOnExpand, toAutoTristateTracking, toAutoDeleteMovedNodes, toDisableAutoscrollOnFocus, toDisableAutoscrollOnEdit]
TreeOptions.MiscOptions = [toAcceptOLEDrop, toEditable, toFullRepaintOnResize, toGridExtensions, toInitOnSave, toToggleOnDblClick, toWheelPanning]
TreeOptions.PaintOptions = [toShowButtons, toShowDropmark, toShowHorzGridLines, toShowVertGridLines, toThemeAware, toUseBlendedImages]
TreeOptions.PaintOptions = [toShowButtons, toShowDropmark, toShowHorzGridLines, toShowVertGridLines, toThemeAware, toUseBlendedImages, toAlwaysHideSelection]
TreeOptions.SelectionOptions = [toExtendedFocus, toMultiSelect, toRightClickSelect]
WantTabs = True
OnBeforeCellPaint = GridBeforeCellPaint
OnFocusChanged = GridFocusChanged
OnFocusChanging = QueryGridFocusChanging
OnGetText = GridGetText
OnPaintText = GridPaintText

33
source/childwin.pas
View File

@@ -451,8 +451,6 @@ type
procedure QueryGridFocusChanging(Sender: TBaseVirtualTree; OldNode,
NewNode: PVirtualNode; OldColumn, NewColumn: TColumnIndex;
var Allowed: Boolean);
procedure GridFocusChanged(Sender: TBaseVirtualTree; Node: PVirtualNode;
Column: TColumnIndex);
procedure pnlQueryHelpersCanResize(Sender: TObject; var NewWidth,
NewHeight: Integer; var Resize: Boolean);
procedure pnlQueryMemoCanResize(Sender: TObject; var NewWidth,
@@ -5672,16 +5670,14 @@ begin
if r.Columns[Column].IsPriPart then
TargetCanvas.Font.Style := TargetCanvas.Font.Style + [fsBold];
// Do not apply any color on a selected, highlighted node to keep readability
if (vsSelected in Node.States) and (
(Column = Sender.FocusedColumn) or (toFullRowSelect in TVirtualStringTree(Sender).TreeOptions.SelectionOptions)
) then
Exit;
// NULL value
isNull := r.Rows[Node.Index].Cells[Column].IsNull;
// Do not apply any color on a selected, highlighted cell to keep readability
if (Node = Sender.FocusedNode) and (Column = Sender.FocusedColumn) then
cl := clHighlightText
// Numeric field
if r.Columns[Column].isInt or r.Columns[Column].isFloat then
else if r.Columns[Column].isInt or r.Columns[Column].isFloat then
if isNull then cl := prefNullColorNumeric else cl := prefFieldColorNumeric
// Date field
else if r.Columns[Column].isDate then
@@ -5856,20 +5852,6 @@ begin
end;
procedure TMDIChild.GridFocusChanged(Sender: TBaseVirtualTree;
Node: PVirtualNode; Column: TColumnIndex);
var
g: TVirtualStringTree;
begin
// Switch to full row selecting if > 1 node is selected
g := (Sender as TVirtualStringTree);
if g.SelectedCount <= 1 then
g.TreeOptions.SelectionOptions := g.TreeOptions.SelectionOptions - [toFullRowSelect]
else
g.TreeOptions.SelectionOptions := g.TreeOptions.SelectionOptions + [toFullRowSelect];
end;
{**
DataGrid: invoke update or insert routine
}
@@ -6444,7 +6426,10 @@ begin
if prefEnableNullBG and gr.Rows[Node.Index].Cells[Column].IsNull then begin
TargetCanvas.Brush.Color := prefNullBG;
TargetCanvas.FillRect(CellRect);
end else if (vsSelected in Node.States) and (Column <> Sender.FocusedColumn) then begin
end else if (Node = Sender.FocusedNode) and (Column = Sender.FocusedColumn) then begin
TargetCanvas.Brush.Color := clHighlight;
TargetCanvas.FillRect(CellRect);
end else if vsSelected in Node.States then begin
TargetCanvas.Brush.Color := clInfoBk;
TargetCanvas.FillRect(CellRect);
end;