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

Fixes Android compiling by making it use the unified RenderForm

Browse Source 
git-svn-id: trunk@34525 -
This commit is contained in:
sekelsenmat 2011-12-31 12:10:19 +00:00
parent 8e92a68084
commit 9887d5131e
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lcl/interfaces/customdrawn/customdrawnobject_android.inc
View File

@ -68,9 +68,6 @@ var
pixels: PCardinal; pixels: PCardinal;
lCurForm: TCDNonNativeForm; lCurForm: TCDNonNativeForm;
struct : TPaintStruct;
lBitmap, lMask: HBITMAP;
lRawImage: TRawImage;
{$IFDEF VerboseCDPaintProfiler} {$IFDEF VerboseCDPaintProfiler}
lTimeStart: TDateTime; lTimeStart: TDateTime;
{$ENDIF} {$ENDIF}
@ -88,25 +85,10 @@ begin
DebugLn(Format('[Java_com_pascal_lclproject_LCLActivity_LCLDrawToBitmap] lCurForm:TCDNonNativeForm=%x', [PtrInt(lCurForm)])); DebugLn(Format('[Java_com_pascal_lclproject_LCLActivity_LCLDrawToBitmap] lCurForm:TCDNonNativeForm=%x', [PtrInt(lCurForm)]));
{$ENDIF} {$ENDIF}
FillChar(struct, SizeOf(TPaintStruct), 0);
// Prepare the non-native image and canvas // Prepare the non-native image and canvas
UpdateControlLazImageAndCanvas(lCurForm.Image, lCurForm.Canvas, Width, Height, clfRGBA32, pixels, True, False); UpdateControlLazImageAndCanvas(lCurForm.Image, lCurForm.Canvas, Width, Height, clfRGBA32, pixels, True, False);
DrawFormBackground(lCurForm.Image, lCurForm.Canvas);
struct.hdc := HDC(lCurForm.Canvas); RenderForm(lCurForm.Image, lCurForm.Canvas, lCurForm.LCLForm);
// Send the paint message to the LCL
{$IFDEF VerboseCDPaintEvent}
//DebugLn(Format('[TCDWSCustomForm.EvPaint] OnPaint event started context: %x', [struct.hdc]));
{$ENDIF}
LCLSendPaintMsg(lCurForm.LCLForm, struct.hdc, @struct);
{$IFDEF VerboseCDPaintEvent}
//DebugLn('[TCDWSCustomForm.EvPaint] OnPaint event ended');
{$ENDIF}
// Now paint all child win controls
RenderChildWinControls(lCurForm.Image, lCurForm.Canvas, lCurForm.Children);
end; end;
// Now returns the bitmap buffer to LCLActivity so that it can render it // Now returns the bitmap buffer to LCLActivity so that it can render it