paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-14 12:59:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'main'

Browse Source 
IDE: Fix saving the specified frame priority for user-defined markup

See merge request freepascal.org/lazarus/lazarus!268
This commit is contained in:
Martin 2024-02-06 13:58:27 +00:00
commit de6b521614
4 changed files with 63 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debugger/frames/debugger_eventlog_options.lfm
View File

@ -171,7 +171,7 @@ inherited DebuggerEventLogOptionsFrame: TDebuggerEventLogOptionsFrame
BorderSpacing.Right = 6
BorderSpacing.Bottom = 6
ItemHeight = 16
OnChange = ForegroundColorBoxChange
OnChange = GeneralColorBoxOnChange
TabOrder = 2
end
object BackGroundColorBox: TColorBox
@ -194,7 +194,7 @@ inherited DebuggerEventLogOptionsFrame: TDebuggerEventLogOptionsFrame
BorderSpacing.Right = 6
BorderSpacing.Bottom = 6
ItemHeight = 16
OnChange = ForegroundColorBoxChange
OnChange = GeneralColorBoxOnChange
TabOrder = 3
end
object ForeGroundLabel: TLabel

4
debugger/frames/debugger_eventlog_options.pas
View File

@ -61,7 +61,7 @@ type
var {%H-}PaintImages, DefaultDraw: Boolean);
procedure ColorTreeChange(Sender: TObject; {%H-}Node: TTreeNode);
procedure ColorTreeClick(Sender: TObject);
procedure ForegroundColorBoxChange(Sender: TObject);
procedure GeneralColorBoxOnChange(Sender: TObject);
private
FColors: array[TDBGEventType] of TDebuggerEventLogColor;
class function GetCategoryStr(ACategory: TDBGEventCategory): String;
@ -141,7 +141,7 @@ begin
UpdateSelectedColor;
end;
procedure TDebuggerEventLogOptionsFrame.ForegroundColorBoxChange(Sender: TObject);
procedure TDebuggerEventLogOptionsFrame.GeneralColorBoxOnChange(Sender: TObject);
begin
if Assigned(ColorTree.Selected) then
begin

84
ide/syncolorattribeditor.lfm
View File

@ -60,13 +60,13 @@ object SynColorAttrEditor: TSynColorAttrEditor
Width = 200
DefaultColorColor = clWhite
Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeDefault, cbCustomColor, cbPrettyNames, cbCustomColors]
OnGetColors = ForegroundColorBoxGetColors
OnGetColors = GeneralColorBoxOnGetColors
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 3
Constraints.MaxWidth = 200
Constraints.MinWidth = 80
ItemHeight = 16
OnChange = ForegroundColorBoxChange
OnChange = GeneralColorBoxOnChange
TabOrder = 1
end
object BackGroundColorBox: TColorBox
@ -80,13 +80,13 @@ object SynColorAttrEditor: TSynColorAttrEditor
Width = 200
DefaultColorColor = clWhite
Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeDefault, cbCustomColor, cbPrettyNames, cbCustomColors]
OnGetColors = ForegroundColorBoxGetColors
OnGetColors = GeneralColorBoxOnGetColors
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 3
Constraints.MaxWidth = 200
Constraints.MinWidth = 80
ItemHeight = 16
OnChange = ForegroundColorBoxChange
OnChange = GeneralColorBoxOnChange
TabOrder = 4
end
object BackGroundUseDefaultCheckBox: TCheckBox
@ -115,13 +115,13 @@ object SynColorAttrEditor: TSynColorAttrEditor
Width = 200
DefaultColorColor = clWhite
Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeDefault, cbCustomColor, cbPrettyNames, cbCustomColors]
OnGetColors = ForegroundColorBoxGetColors
OnGetColors = GeneralColorBoxOnGetColors
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 3
Constraints.MaxWidth = 200
Constraints.MinWidth = 80
ItemHeight = 16
OnChange = ForegroundColorBoxChange
OnChange = GeneralColorBoxOnChange
TabOrder = 7
end
object FrameColorUseDefaultCheckBox: TCheckBox
@ -431,8 +431,8 @@ object SynColorAttrEditor: TSynColorAttrEditor
'slsDotted'
'slsWaved'
)
OnChange = ForegroundColorBoxChange
OnDrawItem = FrameStyleBoxDrawItem
OnChange = GeneralColorBoxOnChange
OnDrawItem = GeneralStyleBoxOnDrawItem
Style = csOwnerDrawFixed
TabOrder = 10
Text = 'slsSolid'
@ -453,7 +453,7 @@ object SynColorAttrEditor: TSynColorAttrEditor
'Bottom'
'Left'
)
OnChange = ForegroundColorBoxChange
OnChange = GeneralColorBoxOnChange
OnDrawItem = FrameEdgesBoxDrawItem
Style = csOwnerDrawFixed
TabOrder = 9
@ -528,11 +528,11 @@ object SynColorAttrEditor: TSynColorAttrEditor
Constraints.MinWidth = 65
MaxValue = 256
MinValue = 1
OnChange = ForeAlphaSpinChange
OnEditingDone = ForeAlphaSpinChange
OnEnter = ForeAlphaSpinEnter
OnExit = ForeAlphaSpinChange
OnResize = ForeAlphaSpinChange
OnChange = GeneralAlphaSpinOnChange
OnEditingDone = GeneralAlphaSpinOnChange
OnEnter = GeneralAlphaSpinOnEnter
OnExit = GeneralAlphaSpinOnChange
OnResize = GeneralAlphaSpinOnChange
TabOrder = 2
Value = 256
end
@ -549,11 +549,11 @@ object SynColorAttrEditor: TSynColorAttrEditor
Constraints.MinWidth = 65
MaxValue = 256
MinValue = 1
OnChange = ForeAlphaSpinChange
OnEditingDone = ForeAlphaSpinChange
OnEnter = ForeAlphaSpinEnter
OnExit = ForeAlphaSpinChange
OnResize = ForeAlphaSpinChange
OnChange = GeneralAlphaSpinOnChange
OnEditingDone = GeneralAlphaSpinOnChange
OnEnter = GeneralAlphaSpinOnEnter
OnExit = GeneralAlphaSpinOnChange
OnResize = GeneralAlphaSpinOnChange
TabOrder = 5
Value = 256
end
@ -570,11 +570,11 @@ object SynColorAttrEditor: TSynColorAttrEditor
Constraints.MinWidth = 65
MaxValue = 256
MinValue = 1
OnChange = ForeAlphaSpinChange
OnEditingDone = ForeAlphaSpinChange
OnEnter = ForeAlphaSpinEnter
OnExit = ForeAlphaSpinChange
OnResize = ForeAlphaSpinChange
OnChange = GeneralAlphaSpinOnChange
OnEditingDone = GeneralAlphaSpinOnChange
OnEnter = GeneralAlphaSpinOnEnter
OnExit = GeneralAlphaSpinOnChange
OnResize = GeneralAlphaSpinOnChange
TabOrder = 8
Value = 256
end
@ -629,9 +629,9 @@ object SynColorAttrEditor: TSynColorAttrEditor
BorderSpacing.Left = 6
Constraints.MinWidth = 65
MaxValue = 9999
OnChange = ForePriorSpinChange
OnEditingDone = ForePriorSpinChange
OnExit = ForePriorSpinChange
OnChange = GeneralPriorSpinOnChange
OnEditingDone = GeneralPriorSpinOnChange
OnExit = GeneralPriorSpinOnChange
TabOrder = 15
Value = 1
end
@ -647,9 +647,9 @@ object SynColorAttrEditor: TSynColorAttrEditor
BorderSpacing.Left = 6
Constraints.MinWidth = 65
MaxValue = 9999
OnChange = ForePriorSpinChange
OnEditingDone = ForePriorSpinChange
OnExit = ForePriorSpinChange
OnChange = GeneralPriorSpinOnChange
OnEditingDone = GeneralPriorSpinOnChange
OnExit = GeneralPriorSpinOnChange
TabOrder = 16
Value = 1
end
@ -665,9 +665,9 @@ object SynColorAttrEditor: TSynColorAttrEditor
BorderSpacing.Left = 6
Constraints.MinWidth = 65
MaxValue = 9999
OnChange = ForePriorSpinChange
OnEditingDone = ForePriorSpinChange
OnExit = ForePriorSpinChange
OnChange = GeneralPriorSpinOnChange
OnEditingDone = GeneralPriorSpinOnChange
OnExit = GeneralPriorSpinOnChange
TabOrder = 17
Value = 1
end
@ -697,13 +697,13 @@ object SynColorAttrEditor: TSynColorAttrEditor
Width = 200
DefaultColorColor = clWhite
Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeDefault, cbCustomColor, cbPrettyNames, cbCustomColors]
OnGetColors = ForegroundColorBoxGetColors
OnGetColors = GeneralColorBoxOnGetColors
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 3
Constraints.MaxWidth = 200
Constraints.MinWidth = 80
ItemHeight = 16
OnChange = ForegroundColorBoxChange
OnChange = GeneralColorBoxOnChange
TabOrder = 18
end
object MarkupFoldAlphaLabel: TLabel
@ -732,11 +732,11 @@ object SynColorAttrEditor: TSynColorAttrEditor
Constraints.MinWidth = 65
MaxValue = 256
MinValue = 1
OnChange = ForeAlphaSpinChange
OnEditingDone = ForeAlphaSpinChange
OnEnter = ForeAlphaSpinEnter
OnExit = ForeAlphaSpinChange
OnResize = ForeAlphaSpinChange
OnChange = GeneralAlphaSpinOnChange
OnEditingDone = GeneralAlphaSpinOnChange
OnEnter = GeneralAlphaSpinOnEnter
OnExit = GeneralAlphaSpinOnChange
OnResize = GeneralAlphaSpinOnChange
TabOrder = 20
Value = 256
end
@ -757,8 +757,8 @@ object SynColorAttrEditor: TSynColorAttrEditor
'slsDotted'
'slsWaved'
)
OnChange = ForegroundColorBoxChange
OnDrawItem = FrameStyleBoxDrawItem
OnChange = GeneralColorBoxOnChange
OnDrawItem = GeneralStyleBoxOnDrawItem
Style = csOwnerDrawFixed
TabOrder = 21
Text = 'slsSolid'

35
ide/syncolorattribeditor.pas
View File

@ -68,14 +68,14 @@ type
TextUnderlineRadioPanel: TPanel;
ForeGroundLabel: TLabel;
ForeGroundUseDefaultCheckBox: TCheckBox;
procedure ForeAlphaSpinChange(Sender: TObject);
procedure ForeAlphaSpinEnter(Sender: TObject);
procedure ForegroundColorBoxChange(Sender: TObject);
procedure ForegroundColorBoxGetColors(Sender: TCustomColorBox; Items: TStrings);
procedure ForePriorSpinChange(Sender: TObject);
procedure GeneralAlphaSpinOnChange(Sender: TObject);
procedure GeneralAlphaSpinOnEnter(Sender: TObject);
procedure GeneralColorBoxOnChange(Sender: TObject);
procedure GeneralColorBoxOnGetColors(Sender: TCustomColorBox; Items: TStrings);
procedure GeneralPriorSpinOnChange(Sender: TObject);
procedure FrameEdgesBoxDrawItem(Control: TWinControl; Index: Integer; ARect: TRect;
{%H-}State: TOwnerDrawState);
procedure FrameStyleBoxDrawItem(Control: TWinControl; Index: Integer; ARect: TRect;
procedure GeneralStyleBoxOnDrawItem(Control: TWinControl; Index: Integer; ARect: TRect;
{%H-}State: TOwnerDrawState);
procedure GeneralCheckBoxOnChange(Sender: TObject);
procedure pnlElementAttributesResize(Sender: TObject);
@ -124,7 +124,7 @@ end;
{ TSynColorAttrEditor }
procedure TSynColorAttrEditor.ForegroundColorBoxChange(Sender: TObject);
procedure TSynColorAttrEditor.GeneralColorBoxOnChange(Sender: TObject);
begin
if (FCurHighlightElement = nil) or UpdatingColor then
exit;
@ -170,7 +170,7 @@ begin
DoChanged;
end;
procedure TSynColorAttrEditor.ForeAlphaSpinChange(Sender: TObject);
procedure TSynColorAttrEditor.GeneralAlphaSpinOnChange(Sender: TObject);
var
v: Integer;
begin
@ -199,7 +199,7 @@ begin
DoChanged;
end;
procedure TSynColorAttrEditor.ForeAlphaSpinEnter(Sender: TObject);
procedure TSynColorAttrEditor.GeneralAlphaSpinOnEnter(Sender: TObject);
begin
UpdatingColor := True;
If TSpinEdit(Sender).Value = 256 then
@ -207,7 +207,7 @@ begin
UpdatingColor := False;
end;
procedure TSynColorAttrEditor.ForegroundColorBoxGetColors(Sender: TCustomColorBox; Items: TStrings);
procedure TSynColorAttrEditor.GeneralColorBoxOnGetColors(Sender: TCustomColorBox; Items: TStrings);
var
i: longint;
begin
@ -218,7 +218,7 @@ begin
end;
end;
procedure TSynColorAttrEditor.ForePriorSpinChange(Sender: TObject);
procedure TSynColorAttrEditor.GeneralPriorSpinOnChange(Sender: TObject);
var
v: Integer;
begin
@ -231,7 +231,7 @@ begin
FCurHighlightElement.ForePriority := v;
if Sender = BackPriorSpin then
FCurHighlightElement.BackPriority := v;
if Sender = FramePriorLabel then
if Sender = FramePriorSpin then
FCurHighlightElement.FramePriority := v;
DoChanged;
@ -304,7 +304,7 @@ begin
end;
end;
procedure TSynColorAttrEditor.FrameStyleBoxDrawItem(Control: TWinControl; Index: Integer; ARect: TRect;
procedure TSynColorAttrEditor.GeneralStyleBoxOnDrawItem(Control: TWinControl; Index: Integer; ARect: TRect;
State: TOwnerDrawState);
var
p: TPoint;
@ -592,7 +592,6 @@ begin
ForeAlphaLabel.Visible := ForeAlphaSpin.Visible;
if FCurHighlightElement.ForeAlpha = 0 then begin
ForeAlphaSpin.Value := 256; // Off
Application.ProcessMessages;
ForeAlphaSpin.Caption := dlgEdOff;
end
else
@ -628,7 +627,7 @@ begin
else
BackAlphaSpin.Value := FCurHighlightElement.BackAlpha;
BackPriorSpin.Visible := ForegroundColorBox.Visible and FShowPrior and
BackPriorSpin.Visible := BackGroundColorBox.Visible and FShowPrior and
(hafPrior in FCurHighlightElement.Features);
BackPriorLabel.Visible := BackPriorSpin.Visible;
BackPriorSpin.Value := FCurHighlightElement.BackPriority;
@ -660,8 +659,8 @@ begin
else
FrameAlphaSpin.Value := FCurHighlightElement.FrameAlpha;
FramePriorSpin.Visible := ForegroundColorBox.Visible and FShowPrior and
(hafPrior in FCurHighlightElement.Features);
FramePriorSpin.Visible := FrameColorBox.Visible and FShowPrior and
(hafPrior in FCurHighlightElement.Features);
FramePriorLabel.Visible := FramePriorSpin.Visible;
FramePriorSpin.Value := FCurHighlightElement.FramePriority;
@ -724,7 +723,7 @@ begin
TextItalicRadioOff.Checked := True;
TextUnderlineCheckBox.Checked := (fsUnderline in FCurHighlightElement.Style) or
(fsUnderline in FCurHighlightElement.StyleMask);
(fsUnderline in FCurHighlightElement.StyleMask);
TextUnderlineRadioPanel.Enabled := TextUnderlineCheckBox.Checked;
if not(fsUnderline in FCurHighlightElement.StyleMask) then