pascal/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-02-12 10:26:05 +02:00
Code Issues Actions Releases Activity

Fix for issue #248 made by pmccarenko

Browse Source
This commit is contained in:
Salvador Díaz Fau 2020-06-25 17:31:09 +02:00
parent b4945628c5
commit b142412810
11 changed files with 146 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demos/Lazarus/JavaScript/JSExtension/JSExtension.lps
View File

@ -20,10 +20,9 @@
<ComponentName Value="JSExtensionFrm"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
<TopLine Value="120"/>
<CursorPos X="83" Y="140"/>
<CursorPos X="71" Y="131"/>
<UsageCount Value="20"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
@ -32,8 +31,9 @@
<Unit2>
<Filename Value="uTestExtensionHandler.pas"/>
<IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="2"/>
<TopLine Value="41"/>
<TopLine Value="40"/>
<CursorPos X="56" Y="94"/>
<UsageCount Value="20"/>
<Loaded Value="True"/>

70
demos/Lazarus/OSRExternalPumpBrowser/OSRExternalPumpBrowser.lps
View File

@ -8,7 +8,7 @@
<Unit0>
<Filename Value="OSRExternalPumpBrowser.lpr"/>
<IsPartOfProject Value="True"/>
<TopLine Value="41"/>
<TopLine Value="55"/>
<CursorPos X="63" Y="61"/>
<UsageCount Value="27"/>
<Loaded Value="True"/>
@ -22,8 +22,8 @@
<ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
<TopLine Value="180"/>
<CursorPos X="5" Y="200"/>
<TopLine Value="429"/>
<CursorPos X="79" Y="442"/>
<UsageCount Value="27"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
@ -85,123 +85,127 @@
<UsageCount Value="10"/>
</Unit9>
</Units>
<JumpHistory Count="29" HistoryIndex="28">
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="391" Column="71" TopLine="350"/>
<Caret Line="392" Column="71" TopLine="351"/>
</Position1>
<Position2>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="392" Column="71" TopLine="351"/>
<Caret Line="535" Column="48" TopLine="496"/>
</Position2>
<Position3>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="535" Column="48" TopLine="496"/>
<Caret Line="537" Column="48" TopLine="496"/>
</Position3>
<Position4>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="537" Column="48" TopLine="496"/>
<Caret Line="807" Column="52" TopLine="766"/>
</Position4>
<Position5>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="807" Column="52" TopLine="766"/>
<Caret Line="828" Column="52" TopLine="787"/>
</Position5>
<Position6>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="828" Column="52" TopLine="787"/>
<Caret Line="845" Column="52" TopLine="804"/>
</Position6>
<Position7>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="845" Column="52" TopLine="804"/>
<Caret Line="859" Column="52" TopLine="818"/>
</Position7>
<Position8>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="859" Column="52" TopLine="818"/>
<Caret Line="1009" Column="52" TopLine="968"/>
</Position8>
<Position9>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="1009" Column="52" TopLine="968"/>
<Caret Line="257" Column="51" TopLine="217"/>
</Position9>
<Position10>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="257" Column="51" TopLine="217"/>
<Caret Line="354" Column="21" TopLine="317"/>
</Position10>
<Position11>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="354" Column="21" TopLine="317"/>
<Caret Line="364" Column="56" TopLine="337"/>
</Position11>
<Position12>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="364" Column="56" TopLine="337"/>
<Caret Line="365" Column="37" TopLine="337"/>
</Position12>
<Position13>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="365" Column="37" TopLine="337"/>
<Caret Line="384" Column="58" TopLine="343"/>
</Position13>
<Position14>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="384" Column="58" TopLine="343"/>
<Caret Line="531" Column="54" TopLine="502"/>
</Position14>
<Position15>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="531" Column="54" TopLine="502"/>
<Caret Line="794" Column="91" TopLine="754"/>
</Position15>
<Position16>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="794" Column="91" TopLine="754"/>
<Caret Line="812" Column="50" TopLine="772"/>
</Position16>
<Position17>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="812" Column="50" TopLine="772"/>
<Caret Line="826" Column="52" TopLine="786"/>
</Position17>
<Position18>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="826" Column="52" TopLine="786"/>
<Caret Line="837" Column="87" TopLine="818"/>
</Position18>
<Position19>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="837" Column="87" TopLine="818"/>
<Caret Line="984" Column="59" TopLine="944"/>
</Position19>
<Position20>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="984" Column="59" TopLine="944"/>
<Caret Line="252" Column="40" TopLine="229"/>
</Position20>
<Position21>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="252" Column="40" TopLine="229"/>
<Caret Line="342" Column="40" TopLine="319"/>
</Position21>
<Position22>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="342" Column="40" TopLine="319"/>
<Caret Line="365" Column="37" TopLine="354"/>
</Position22>
<Position23>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="365" Column="37" TopLine="354"/>
<Caret Line="380" Column="36" TopLine="354"/>
</Position23>
<Position24>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="380" Column="36" TopLine="354"/>
<Caret Line="526" Column="44" TopLine="497"/>
</Position24>
<Position25>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="526" Column="44" TopLine="497"/>
<Caret Line="793" Column="48" TopLine="767"/>
</Position25>
<Position26>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="793" Column="48" TopLine="767"/>
<Caret Line="811" Column="48" TopLine="770"/>
</Position26>
<Position27>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="811" Column="48" TopLine="770"/>
<Caret Line="825" Column="48" TopLine="784"/>
</Position27>
<Position28>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="825" Column="48" TopLine="784"/>
<Caret Line="836" Column="48" TopLine="795"/>
</Position28>
<Position29>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="836" Column="48" TopLine="795"/>
<Caret Line="246" Column="61" TopLine="231"/>
</Position29>
<Position30>
<Filename Value="uOSRExternalPumpBrowser.pas"/>
<Caret Line="94" Column="15" TopLine="94"/>
</Position30>
</JumpHistory>
<RunParams>
<FormatVersion Value="2"/>

2
demos/Lazarus/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.lfm
View File

@ -16,7 +16,7 @@ object OSRExternalPumpBrowserFrm: TOSRExternalPumpBrowserFrm
OnHide = FormHide
OnShow = FormShow
Position = poScreenCenter
LCLVersion = '2.0.6.0'
LCLVersion = '2.0.8.0'
object NavControlPnl: TPanel
Left = 0
Height = 21

65
demos/Lazarus/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas
View File

@ -436,53 +436,50 @@ begin
TempHeight := Panel1.BufferHeight;
end;
if (TempBufferBits <> nil) then
SrcStride := aWidth * SizeOf(TRGBQuad);
n := 0;
while (n < dirtyRectsCount) do
begin
SrcStride := aWidth * SizeOf(TRGBQuad);
n := 0;
while (n < dirtyRectsCount) do
if (dirtyRects^[n].x >= 0) and (dirtyRects^[n].y >= 0) then
begin
if (dirtyRects^[n].x >= 0) and (dirtyRects^[n].y >= 0) then
TempLineSize := min(dirtyRects^[n].width, TempWidth - dirtyRects^[n].x) * SizeOf(TRGBQuad);
if (TempLineSize > 0) then
begin
TempLineSize := min(dirtyRects^[n].width, TempWidth - dirtyRects^[n].x) * SizeOf(TRGBQuad);
TempSrcOffset := ((dirtyRects^[n].y * aWidth) + dirtyRects^[n].x) * SizeOf(TRGBQuad);
TempDstOffset := (dirtyRects^[n].x * SizeOf(TRGBQuad));
if (TempLineSize > 0) then
src := @PByte(buffer)[TempSrcOffset];
i := 0;
j := min(dirtyRects^[n].height, TempHeight - dirtyRects^[n].y);
while (i < j) do
begin
TempSrcOffset := ((dirtyRects^[n].y * aWidth) + dirtyRects^[n].x) * SizeOf(TRGBQuad);
TempDstOffset := (dirtyRects^[n].x * SizeOf(TRGBQuad));
TempBufferBits := TempBitmap.Scanline[dirtyRects^[n].y + i];
dst := @PByte(TempBufferBits)[TempDstOffset];
src := @PByte(buffer)[TempSrcOffset];
Move(src^, dst^, TempLineSize);
i := 0;
j := min(dirtyRects^[n].height, TempHeight - dirtyRects^[n].y);
while (i < j) do
begin
TempBufferBits := TempBitmap.Scanline[dirtyRects^[n].y + i];
dst := @PByte(TempBufferBits)[TempDstOffset];
Move(src^, dst^, TempLineSize);
Inc(src, SrcStride);
inc(i);
end;
Inc(src, SrcStride);
inc(i);
end;
end;
inc(n);
end;
TempBitmap.EndUpdate;
inc(n);
end;
if FShowPopup and (FPopUpBitmap <> nil) then
begin
TempSrcRect := Rect(0, 0,
min(FPopUpRect.Right - FPopUpRect.Left, FPopUpBitmap.Width),
min(FPopUpRect.Bottom - FPopUpRect.Top, FPopUpBitmap.Height));
TempBitmap.EndUpdate;
Panel1.BufferDraw(FPopUpBitmap, TempSrcRect, FPopUpRect);
end;
if FShowPopup and (FPopUpBitmap <> nil) then
begin
TempSrcRect := Rect(0, 0,
min(FPopUpRect.Right - FPopUpRect.Left, FPopUpBitmap.Width),
min(FPopUpRect.Bottom - FPopUpRect.Top, FPopUpBitmap.Height));
Panel1.BufferDraw(FPopUpBitmap, TempSrcRect, FPopUpRect);
end;
Panel1.EndBufferDraw;

12
demos/Lazarus/PopupBrowser/PopupBrowser.lps
View File

@ -36,12 +36,12 @@
<ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="2"/>
<TopLine Value="109"/>
<CursorPos X="15" Y="122"/>
<TopLine Value="388"/>
<CursorPos X="6" Y="406"/>
<UsageCount Value="22"/>
<Bookmarks Count="2">
<Item0 X="64" Y="173" ID="2"/>
<Item1 Y="704" ID="1"/>
<Item1 Y="701" ID="1"/>
</Bookmarks>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
@ -78,7 +78,7 @@
<UsageCount Value="10"/>
</Unit6>
</Units>
<JumpHistory Count="23" HistoryIndex="22">
<JumpHistory Count="24" HistoryIndex="23">
<Position1>
<Filename Value="uMainForm.pas"/>
<Caret Line="81" Column="34" TopLine="68"/>
@ -171,6 +171,10 @@
<Filename Value="..\..\..\source\uCEFMiscFunctions.pas"/>
<Caret Line="1761" Column="30" TopLine="1751"/>
</Position23>
<Position24>
<Filename Value="uChildForm.pas"/>
<Caret Line="87" Column="32" TopLine="75"/>
</Position24>
</JumpHistory>
<RunParams>
<FormatVersion Value="2"/>

2
demos/Lazarus/PopupBrowser/uChildForm.lfm
View File

@ -18,7 +18,7 @@ object ChildForm: TChildForm
OnShow = FormShow
Position = poScreenCenter
ShowInTaskBar = stAlways
LCLVersion = '2.0.2.0'
LCLVersion = '2.0.8.0'
object Panel1: TBufferPanel
Left = 0
Height = 256

57
demos/Lazarus/PopupBrowser/uChildForm.pas
View File

@ -403,49 +403,46 @@ begin
TempHeight := Panel1.BufferHeight;
end;
if (TempBufferBits <> nil) then
SrcStride := aWidth * SizeOf(TRGBQuad);
n := 0;
while (n < dirtyRectsCount) do
begin
SrcStride := aWidth * SizeOf(TRGBQuad);
n := 0;
while (n < dirtyRectsCount) do
if (dirtyRects^[n].x >= 0) and (dirtyRects^[n].y >= 0) then
begin
if (dirtyRects^[n].x >= 0) and (dirtyRects^[n].y >= 0) then
TempLineSize := min(dirtyRects^[n].width, TempWidth - dirtyRects^[n].x) * SizeOf(TRGBQuad);
if (TempLineSize > 0) then
begin
TempLineSize := min(dirtyRects^[n].width, TempWidth - dirtyRects^[n].x) * SizeOf(TRGBQuad);
TempSrcOffset := ((dirtyRects^[n].y * aWidth) + dirtyRects^[n].x) * SizeOf(TRGBQuad);
TempDstOffset := (dirtyRects^[n].x * SizeOf(TRGBQuad));
if (TempLineSize > 0) then
src := @PByte(buffer)[TempSrcOffset];
i := 0;
j := min(dirtyRects^[n].height, TempHeight - dirtyRects^[n].y);
while (i < j) do
begin
TempSrcOffset := ((dirtyRects^[n].y * aWidth) + dirtyRects^[n].x) * SizeOf(TRGBQuad);
TempDstOffset := (dirtyRects^[n].x * SizeOf(TRGBQuad));
TempBufferBits := TempBitmap.Scanline[dirtyRects^[n].y + i];
dst := @PByte(TempBufferBits)[TempDstOffset];
src := @PByte(buffer)[TempSrcOffset];
Move(src^, dst^, TempLineSize);
i := 0;
j := min(dirtyRects^[n].height, TempHeight - dirtyRects^[n].y);
while (i < j) do
begin
TempBufferBits := TempBitmap.Scanline[dirtyRects^[n].y + i];
dst := @PByte(TempBufferBits)[TempDstOffset];
Move(src^, dst^, TempLineSize);
Inc(src, SrcStride);
inc(i);
end;
Inc(src, SrcStride);
inc(i);
end;
end;
inc(n);
end;
TempBitmap.EndUpdate;
if FShowPopup and (FPopUpBitmap <> nil) then
Panel1.BufferDraw(FPopUpRect.Left, FPopUpRect.Top, FPopUpBitmap);
inc(n);
end;
TempBitmap.EndUpdate;
if FShowPopup and (FPopUpBitmap <> nil) then
Panel1.BufferDraw(FPopUpRect.Left, FPopUpRect.Top, FPopUpBitmap);
Panel1.EndBufferDraw;
if HandleAllocated then PostMessage(Handle, CEF_PENDINGINVALIDATE, 0, 0);

10
demos/Lazarus/SimpleOSRBrowser/SimpleOSRBrowser.lps
View File

@ -8,10 +8,9 @@
<Unit0>
<Filename Value="SimpleOSRBrowser.lpr"/>
<IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
<TopLine Value="30"/>
<CursorPos X="28" Y="39"/>
<TopLine Value="18"/>
<CursorPos X="61" Y="60"/>
<UsageCount Value="20"/>
<Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="Delphi"/>
@ -38,8 +37,9 @@
<ComponentName Value="Form1"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<TopLine Value="382"/>
<CursorPos X="60" Y="393"/>
<IsVisibleTab Value="True"/>
<TopLine Value="444"/>
<CursorPos X="51" Y="445"/>
<UsageCount Value="42"/>
<Bookmarks Count="2">
<Item0 X="40" Y="301" ID="4"/>

2
demos/Lazarus/SimpleOSRBrowser/usimplelazosrbrowser.lfm
View File

@ -16,7 +16,7 @@ object Form1: TForm1
OnHide = FormHide
OnShow = FormShow
Position = poScreenCenter
LCLVersion = '2.0.6.0'
LCLVersion = '2.0.8.0'
object NavControlPnl: TPanel
Left = 0
Height = 21

65
demos/Lazarus/SimpleOSRBrowser/usimplelazosrbrowser.pas
View File

@ -445,53 +445,50 @@ begin
TempHeight := Panel1.BufferHeight;
end;
if (TempBufferBits <> nil) then
SrcStride := aWidth * SizeOf(TRGBQuad);
n := 0;
while (n < dirtyRectsCount) do
begin
SrcStride := aWidth * SizeOf(TRGBQuad);
n := 0;
while (n < dirtyRectsCount) do
if (dirtyRects^[n].x >= 0) and (dirtyRects^[n].y >= 0) then
begin
if (dirtyRects^[n].x >= 0) and (dirtyRects^[n].y >= 0) then
TempLineSize := min(dirtyRects^[n].width, TempWidth - dirtyRects^[n].x) * SizeOf(TRGBQuad);
if (TempLineSize > 0) then
begin
TempLineSize := min(dirtyRects^[n].width, TempWidth - dirtyRects^[n].x) * SizeOf(TRGBQuad);
TempSrcOffset := ((dirtyRects^[n].y * aWidth) + dirtyRects^[n].x) * SizeOf(TRGBQuad);
TempDstOffset := (dirtyRects^[n].x * SizeOf(TRGBQuad));
if (TempLineSize > 0) then
src := @PByte(buffer)[TempSrcOffset];
i := 0;
j := min(dirtyRects^[n].height, TempHeight - dirtyRects^[n].y);
while (i < j) do
begin
TempSrcOffset := ((dirtyRects^[n].y * aWidth) + dirtyRects^[n].x) * SizeOf(TRGBQuad);
TempDstOffset := (dirtyRects^[n].x * SizeOf(TRGBQuad));
TempBufferBits := TempBitmap.Scanline[dirtyRects^[n].y + i];
dst := @PByte(TempBufferBits)[TempDstOffset];
src := @PByte(buffer)[TempSrcOffset];
Move(src^, dst^, TempLineSize);
i := 0;
j := min(dirtyRects^[n].height, TempHeight - dirtyRects^[n].y);
while (i < j) do
begin
TempBufferBits := TempBitmap.Scanline[dirtyRects^[n].y + i];
dst := @PByte(TempBufferBits)[TempDstOffset];
Move(src^, dst^, TempLineSize);
Inc(src, SrcStride);
inc(i);
end;
Inc(src, SrcStride);
inc(i);
end;
end;
inc(n);
end;
TempBitmap.EndUpdate;
inc(n);
end;
if FShowPopup and (FPopUpBitmap <> nil) then
begin
TempSrcRect := Rect(0, 0,
min(FPopUpRect.Right - FPopUpRect.Left, FPopUpBitmap.Width),
min(FPopUpRect.Bottom - FPopUpRect.Top, FPopUpBitmap.Height));
TempBitmap.EndUpdate;
Panel1.BufferDraw(FPopUpBitmap, TempSrcRect, FPopUpRect);
end;
if FShowPopup and (FPopUpBitmap <> nil) then
begin
TempSrcRect := Rect(0, 0,
min(FPopUpRect.Right - FPopUpRect.Left, FPopUpBitmap.Width),
min(FPopUpRect.Bottom - FPopUpRect.Top, FPopUpBitmap.Height));
Panel1.BufferDraw(FPopUpBitmap, TempSrcRect, FPopUpRect);
end;
Panel1.EndBufferDraw;

2
update_CEF4Delphi.json
View File

@ -2,7 +2,7 @@
"UpdateLazPackages" : [
{
"ForceNotify" : true,
"InternalVersion" : 149,
"InternalVersion" : 150,
"Name" : "cef4delphi_lazarus.lpk",
"Version" : "83.4.0.0"
}