Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding () around needed parts #337

Open
wants to merge 1 commit into
base: HtmlViewer-11.10
Choose a base branch
from
Open

Adding () around needed parts #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions package/FrameViewer09.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ interface

uses
DitherUnit, FramBrwz, FrameViewerReg, FramView, HtmlBuffer, HtmlGif1,
HTMLGif2, HtmlGlobals, HtmlMisc, Htmlsbs1, HTMLSubs, HtmlView, ReadHTML,
StylePars, StyleUn, URLSubs, msimg32, AlphaBlendUn, HSLUtils, BuffConv,
BuffConvArrays, HtmlSymb, BegaHtmlPrintPreviewForm, BegaMetaFilePrinter,
BegaPreview, BegaPreviewForm, BegaPreviewPanel, BegaScrollBox, BegaZoom,
GDIPL2A, HtmlCaches, HtmlFonts, HtmlImages, MetaFilePrinter, StyleTypes,
vwPrint, UrlConn, HtmlPrinter, HTMLUn2, LazarusPackageIntf;
HTMLGif2, HtmlGlobals, HtmlMisc, Htmlsbs1, HTMLSubs, HTMLUn2, HtmlView,
ReadHTML, StylePars, StyleUn, URLSubs, msimg32, AlphaBlendUn, HSLUtils,
BuffConv, BuffConvArrays, HtmlSymb, BegaHtmlPrintPreviewForm,
BegaMetaFilePrinter, BegaPreview, BegaPreviewForm, BegaPreviewPanel,
BegaScrollBox, BegaZoom, GDIPL2A, HtmlCaches, HtmlFonts, HtmlImages,
MetaFilePrinter, StyleTypes, vwPrint, UrlConn, HtmlPrinter,
LazarusPackageIntf;

implementation

Expand Down
6 changes: 3 additions & 3 deletions source/HTMLSubs.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4515,7 +4515,7 @@ function TCellBasic.CheckLastBottomMargin: Boolean;
while I < Count do
begin
TB := Items[I];
if TB is TSection and (Length(Trim(TSection(TB).BuffS)) = 0) then
if (TB is TSection) and (Length(Trim(TSection(TB).BuffS)) = 0) then
else if not (TB is TBlock) or (TBlock(TB).Positioning <> PosAbsolute) then
break;

Expand All @@ -4539,7 +4539,7 @@ function TCellBasic.CheckLastBottomMargin: Boolean;
while J >= I do
begin
TB := Items[J];
if TB is TSection and (Length(Trim(TSection(TB).BuffS)) = 0) then
if (TB is TSection) and (Length(Trim(TSection(TB).BuffS)) = 0) then
else if not (TB is TBlock) or (TBlock(TB).Positioning <> PosAbsolute) then
break;

Expand Down Expand Up @@ -5977,7 +5977,7 @@ function TBlock.Draw1(Canvas: TCanvas; const ARect: TRect; IMgr: TIndentManager;
if Result < Document.PageBottom then
Document.PageBottom := Result;
end
else if Self is TTableBlock and not TTableBlock(Self).Table.HeadOrFoot then {ordinary tables}
else if (Self is TTableBlock) and not TTableBlock(Self).Table.HeadOrFoot then {ordinary tables}
{if we're printing and
we're 2/3 down page and table won't fit on this page and table will fit on
next page, then don't do table now}
Expand Down
2 changes: 1 addition & 1 deletion source/htmlview.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4870,7 +4870,7 @@ procedure THtmlViewer.FormControlEnterEvent(Sender: TObject);
Invalidate;
end;
end
else if Sender is TFontObj and not NoJump then
else if (Sender is TFontObj) and not NoJump then
begin
Y := TFontObj(Sender).DrawYY;
Pos := VScrollBarPosition;
Expand Down