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

LCL: TCanvas.DrawText: changing and restoring BKMode when Style.Opaque=false

Browse Source 
git-svn-id: trunk@10766 -
This commit is contained in:
mattias 2007-03-18 21:57:25 +00:00
parent e730abc793
commit 91e8c58c50
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/objectinspector/oiexample.lpi
View File

@ -12,7 +12,6 @@
</General> </General>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
<IgnoreBinaries Value="False"/>
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
<ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/> <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
</PublishOptions> </PublishOptions>

2
ideintf/propedits.pp
View File

@ -2533,7 +2533,7 @@ begin
ExpandTabs := True; ExpandTabs := True;
SystemFont := False; SystemFont := False;
end; end;
ACanvas.TextRect(ARect,ARect.Left+2,ARect.Top,GetName, Style); ACanvas.TextRect(ARect,ARect.Left+2,ARect.Top,GetName,Style);
end; end;
procedure TPropertyEditor.PropDrawValue(ACanvas:TCanvas; const ARect: TRect; procedure TPropertyEditor.PropDrawValue(ACanvas:TCanvas; const ARect: TRect;

14
lcl/include/canvas.inc
View File

@ -1048,17 +1048,25 @@ begin
InterSectClipRect(Self.Handle, Left, Top, Right, Bottom); InterSectClipRect(Self.Handle, Left, Top, Right, Bottom);
Options := Options or DT_NOCLIP; // no clipping as we are handling it here Options := Options or DT_NOCLIP; // no clipping as we are handling it here
end; end;
If Style.Opaque then begin if Style.Opaque then begin
RequiredState([csHandleValid, csBrushValid]); RequiredState([csHandleValid, csBrushValid]);
FillRect(fRect); FillRect(fRect);
end else begin
SetBkMode(FHandle, TRANSPARENT);
end; end;
If Style.SystemFont then if Style.SystemFont then
SetTextColor(Self.Handle, Font.Color); SetTextColor(Self.Handle, Font.Color);
//debugln('TCanvas.TextRect DRAW Text="',Text,'" ',dbgs(fRect)); //debugln('TCanvas.TextRect DRAW Text="',Text,'" ',dbgs(fRect));
DrawText(Self.Handle, pChar(Text), Length(Text), fRect, Options); DrawText(Self.Handle, pChar(Text), Length(Text), fRect, Options);
if Style.Opaque and (csBrushValid in FState) then begin
if Brush.Style=bsSolid then
// restore BKMode
SetBkMode(FHandle, OPAQUE)
end;
if Style.Clipping then begin if Style.Clipping then begin
if DCIndex <> -1 then if DCIndex <> -1 then
RestoreDC(Self.Handle, DCIndex); RestoreDC(Self.Handle, DCIndex);