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

feat: make grid-highlight-same-text-color part of the predefined color schemes

Browse Source
This commit is contained in:
Ansgar Becker
2026-01-27 17:38:15 +01:00
parent 42b5d52fbb
commit 7854157fcc
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/generic_types.pas
View File

@@ -32,6 +32,7 @@ type
ActiveLineBackground: TColor;
MatchingBraceForeground: TColor;
MatchingBraceBackground: TColor;
HightlightSameTextBackground: TColor; // This is for grids only, and there's no foreground setting.
const GridNullBrightness = 20;
constructor Create;
destructor Destroy; override;
@@ -153,6 +154,7 @@ begin
ActiveLineBackground := StringToColor(AppSettings.ReadString(asSQLColActiveLine));
MatchingBraceBackground := StringToColor(AppSettings.ReadString(asSQLColMatchingBraceBackground));
MatchingBraceForeground := StringToColor(AppSettings.ReadString(asSQLColMatchingBraceForeground));
HightlightSameTextBackground := AppSettings.ReadInt(asHightlightSameTextBackground);
GridTextColors[dtcInteger] := AppSettings.ReadInt(asFieldColorNumeric);
GridTextColors[dtcReal] := AppSettings.ReadInt(asFieldColorReal);
@@ -191,6 +193,7 @@ begin
AppSettings.WriteString(asSQLColMatchingBraceForeground, ColorToString(MatchingBraceForeground));
AppSettings.WriteString(asSQLColMatchingBraceBackground, ColorToString(MatchingBraceBackground));
// Grid data type colors
AppSettings.WriteInt(asHightlightSameTextBackground, HightlightSameTextBackground);
AppSettings.WriteInt(asFieldColorNumeric, GridTextColors[dtcInteger]);
AppSettings.WriteInt(asFieldColorReal, GridTextColors[dtcReal]);
AppSettings.WriteInt(asFieldColorText, GridTextColors[dtcText]);
@@ -231,6 +234,7 @@ begin
Scheme.ActiveLineBackground := clNone;
Scheme.MatchingBraceForeground := $0028EFFF;
Scheme.MatchingBraceBackground := $004D513B;
Scheme.HightlightSameTextBackground := clBlack;
Scheme.GridTextColors[dtcInteger] := $00FF9785;
Scheme.GridTextColors[dtcReal] := $00D07D7D;
Scheme.GridTextColors[dtcText] := $0073D573;
@@ -255,6 +259,7 @@ begin
Scheme.ActiveLineBackground := clNone;
Scheme.MatchingBraceForeground := clBlack;
Scheme.MatchingBraceBackground := clAqua;
Scheme.HightlightSameTextBackground := $00D8F8FF;
Scheme.GridTextColors[dtcInteger] := $00FF0000;
Scheme.GridTextColors[dtcReal] := $00FF0048;
Scheme.GridTextColors[dtcText] := $00008000;
@@ -279,6 +284,7 @@ begin
Scheme.ActiveLineBackground := clNone;
Scheme.MatchingBraceForeground := clBlack;
Scheme.MatchingBraceBackground := clAqua;
Scheme.HightlightSameTextBackground := $00F4F4F4;
Scheme.GridTextColors[dtcInteger] := $00000000;
Scheme.GridTextColors[dtcReal] := $00000000;
Scheme.GridTextColors[dtcText] := $00000000;
@@ -303,6 +309,7 @@ begin
Scheme.ActiveLineBackground := clNone;
Scheme.MatchingBraceForeground := $0028EFFF;
Scheme.MatchingBraceBackground := $004D513B;
Scheme.HightlightSameTextBackground := clBlack;
Scheme.GridTextColors[dtcInteger] := $00FFFFFF;
Scheme.GridTextColors[dtcReal] := $00FFFFFF;
Scheme.GridTextColors[dtcText] := $00FFFFFF;

2
source/main.pas
View File

@@ -11010,7 +11010,7 @@ begin
if (Sender.FocusedNode <> nil) and (Sender.FocusedColumn > 0) and (Sender.SelectedCount <= 100) then begin
if ((not Sender.Selected[Node]) and (Column = Sender.FocusedColumn))
or (Sender.Selected[Node] and (Column <> Sender.FocusedColumn)) then begin
clSameData := AppSettings.ReadInt(asHightlightSameTextBackground);
clSameData := AppColorSchemes.First.HightlightSameTextBackground;
if clSameData <> clNone then begin
FieldText := r.Col(ResultCol);
CurrentIsNull := r.IsNull(ResultCol);

2
source/preferences.pas
View File

@@ -915,6 +915,8 @@ begin
FAppColorScheme.GridTextColors[dtc] := ColorScheme.GridTextColors[dtc];
end;
comboGridTextColorsSelect(comboGridTextColors);
FAppColorScheme.HightlightSameTextBackground := ColorScheme.HightlightSameTextBackground;
cboxRowHighlightSameText.Selected := ColorScheme.HightlightSameTextBackground;
if comboGridTextColorsPreset.ItemIndex > 0 then
Modified(Sender);
end;