jvcllaz: Fix resolution of html entities in TJvMarkupLabel and TJvMarkupViewer.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8276 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2022-05-07 14:51:41 +00:00
parent 201c83c606
commit e017e82ce5
7 changed files with 50 additions and 14 deletions

View File

@ -24,7 +24,6 @@
</PublishOptions>
<RunParams>
<FormatVersion Value="2"/>
<Modes Count="0"/>
</RunParams>
<RequiredPackages Count="3">
<Item1>
@ -62,6 +61,9 @@
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Linking>
<Debugging>
<DebugInfoType Value="dsDwarf2Set"/>
</Debugging>
<Options>
<Win32>
<GraphicApplication Value="True"/>

View File

@ -14,7 +14,7 @@ uses
begin
RequireDerivedFormResource := True;
Application.Scaled := True;
Application.Scaled:=True;
Application.Initialize;
Application.CreateForm(TMainForm, MainForm);
Application.Run;

View File

@ -7,7 +7,7 @@ object MainForm: TMainForm
ClientHeight = 519
ClientWidth = 740
OnCreate = FormCreate
LCLVersion = '2.1.0.0'
LCLVersion = '2.3.0.0'
inline SynEdit1: TSynEdit
Left = 0
Height = 322
@ -456,6 +456,7 @@ object MainForm: TMainForm
'<font color="blue">blue</font>'
'<br><font size="6">small text</font> and <font size="20">large</font> text'
'<br>A different font face: <font face="Times" size="14">Times</font>'
'<br>HTML entities: &amp; &trade; &radic;&alpha; &beta; &gamma; &delta; 90&deg;'
'<br>Subscripts and superscripts are not supported:'
'10 cm<sup>3</sup> H<sub>2</sub>O '
)
@ -570,7 +571,7 @@ object MainForm: TMainForm
Left = 4
Height = 19
Top = 0
Width = 99
Width = 97
BorderSpacing.Left = 4
BorderSpacing.Bottom = 4
Caption = 'Markup Viewer'
@ -584,10 +585,10 @@ object MainForm: TMainForm
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = RbMarkupViewer
AnchorSideTop.Side = asrCenter
Left = 119
Left = 117
Height = 19
Top = 0
Width = 92
Width = 90
BorderSpacing.Left = 16
Caption = 'Markup Label'
OnChange = RbMarkupLabelChange
@ -598,7 +599,7 @@ object MainForm: TMainForm
object SynHTMLSyn1: TSynHTMLSyn
DefaultFilter = 'HTML Document (*.htm,*.html)|*.htm;*.html'
Enabled = False
left = 456
top = 192
Left = 456
Top = 192
end
end

View File

@ -42,7 +42,7 @@ implementation
{ TMainForm }
procedure TMainForm.FormCreate(Sender: TObject);
begin
begin
JvMarkupViewer1.Text := SynEdit1.Lines.Text;
JvMarkupLabel1.Text := SynEdit1.Lines.Text;
JvMarkupViewer1.Align := alClient;
@ -54,11 +54,13 @@ end;
procedure TMainForm.RbMarkupViewerChange(Sender: TObject);
begin
JvMarkupViewer1.Visible := RbMarkupViewer.Checked;
JvMarkupLabel1.Visible := not RbMarkupViewer.Checked;
end;
procedure TMainForm.RbMarkupLabelChange(Sender: TObject);
begin
JvMarkupLabel1.Visible := RbMarkupLabel.Checked;
JvMarkupViewer1.Visible := not RbMarkupLabel.Checked;
end;
procedure TMainForm.SynEdit1Change(Sender: TObject);