paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-20 12:19:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 52019 #3855ea4ebd, 52028 #c0eee1ac56 from trunk:

Browse Source 
TurboPower_IPro: Fix ineffective "align" attribute in <div> and <p> tags. 
........
Turbopower_iPro: In PrintPreview form, remove usage of hardcoded MS Sans Serif font.
........

git-svn-id: branches/fixes_1_6@52033 -
This commit is contained in:
maxim 2016-03-23 21:29:28 +00:00
parent 3368e78218
commit 7daa1cb776
2 changed files with 63 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/turbopower_ipro/iphtmlblocklayout.pas
View File

@ -511,7 +511,12 @@ begin
FBlockDescent := PropA.tmDescent;
end;
if (FCurProps = nil) or not BIsEqualTo(FCurProps) then begin
FAl := self.Props.Alignment; // was: FAl := Alignment
// FAl := self.Props.Alignment; // was: FAl := Alignment
// wp: next line was changed to "FAl := self.Props.Alignment" in order
// to fix horizontal text alignment of table cells (r50145).
// But with this change, something like "<p align="center"> does not work any more!
// Alignment within cells still seems to work correctly after user to old code.
FAl := Alignment;
FVAL := VAlignment;
FBaseOffset := FontBaseline;
aPrefor := Preformatted;

112
components/turbopower_ipro/iphtmlpv.lfm
View File

@ -6,23 +6,21 @@ object IpHTMLPreview: TIpHTMLPreview
Caption = 'Print preview'
ClientHeight = 372
ClientWidth = 645
Font.Height = -11
Font.Name = 'MS Sans Serif'
OnCreate = FormCreate
OnDestroy = FormDestroy
OnResize = FormResize
OnShow = FormShow
Position = poScreenCenter
LCLVersion = '0.9.29'
LCLVersion = '1.7'
object Panel1: TPanel
Left = 0
Height = 33
Height = 36
Top = 0
Width = 645
Align = alTop
AutoSize = True
BevelOuter = bvNone
ClientHeight = 33
ClientHeight = 36
ClientWidth = 645
TabOrder = 0
object Label1: TLabel
@ -30,9 +28,9 @@ object IpHTMLPreview: TIpHTMLPreview
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 398
Height = 14
Top = 9
Left = 422
Height = 15
Top = 11
Width = 29
BorderSpacing.Around = 5
Caption = 'Page:'
@ -43,10 +41,10 @@ object IpHTMLPreview: TIpHTMLPreview
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 469
Height = 14
Top = 9
Width = 10
Left = 493
Height = 15
Top = 11
Width = 11
BorderSpacing.Around = 5
Caption = 'of'
ParentColor = False
@ -56,9 +54,9 @@ object IpHTMLPreview: TIpHTMLPreview
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 484
Left = 509
Height = 1
Top = 16
Top = 18
Width = 1
BorderSpacing.Around = 5
ParentColor = False
@ -68,19 +66,21 @@ object IpHTMLPreview: TIpHTMLPreview
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 159
Height = 14
Top = 9
Width = 31
Left = 170
Height = 15
Top = 11
Width = 35
BorderSpacing.Around = 5
Caption = 'Zoom:'
ParentColor = False
end
object btnPrint: TButton
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 5
Height = 23
Top = 5
Width = 47
Height = 25
Top = 6
Width = 51
AutoSize = True
BorderSpacing.Around = 5
Caption = 'Print'
@ -93,10 +93,10 @@ object IpHTMLPreview: TIpHTMLPreview
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 318
Height = 23
Top = 5
Width = 38
Left = 336
Height = 25
Top = 6
Width = 42
AutoSize = True
BorderSpacing.Around = 5
Caption = '<<'
@ -108,10 +108,10 @@ object IpHTMLPreview: TIpHTMLPreview
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 361
Height = 23
Top = 5
Width = 32
Left = 383
Height = 25
Top = 6
Width = 34
AutoSize = True
BorderSpacing.Around = 5
Caption = '<'
@ -123,10 +123,10 @@ object IpHTMLPreview: TIpHTMLPreview
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 490
Height = 23
Top = 5
Width = 32
Left = 515
Height = 25
Top = 6
Width = 34
AutoSize = True
BorderSpacing.Around = 5
Caption = '>'
@ -138,10 +138,10 @@ object IpHTMLPreview: TIpHTMLPreview
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 527
Height = 23
Top = 5
Width = 38
Left = 554
Height = 25
Top = 6
Width = 42
AutoSize = True
BorderSpacing.Around = 5
Caption = '>>'
@ -153,10 +153,10 @@ object IpHTMLPreview: TIpHTMLPreview
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 261
Height = 23
Top = 5
Width = 52
Left = 276
Height = 25
Top = 6
Width = 55
AutoSize = True
BorderSpacing.Around = 5
Cancel = True
@ -169,9 +169,9 @@ object IpHTMLPreview: TIpHTMLPreview
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 432
Height = 21
Top = 6
Left = 456
Height = 23
Top = 7
Width = 32
BorderSpacing.Around = 5
OnChange = edtPageChange
@ -183,12 +183,12 @@ object IpHTMLPreview: TIpHTMLPreview
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 195
Height = 21
Top = 6
Left = 210
Height = 23
Top = 7
Width = 61
BorderSpacing.Around = 5
ItemHeight = 13
ItemHeight = 15
Items.Strings = (
'10%'
'25%'
@ -209,10 +209,10 @@ object IpHTMLPreview: TIpHTMLPreview
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideTop.Side = asrCenter
Left = 57
Height = 23
Top = 5
Width = 97
Left = 61
Height = 25
Top = 6
Width = 104
AutoSize = True
BorderSpacing.Around = 5
Caption = 'Select printer...'
@ -222,11 +222,13 @@ object IpHTMLPreview: TIpHTMLPreview
end
object ScrollBox1: TScrollBox
Left = 0
Height = 339
Top = 33
Height = 336
Top = 36
Width = 645
HorzScrollBar.Page = 158
VertScrollBar.Page = 125
Align = alClient
ClientHeight = 335
ClientHeight = 332
ClientWidth = 641
Color = clBtnFace
ParentColor = False