pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fixing carbon richmemo implementation. updating test project file

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@842 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
skalogryz
2009-06-13 16:38:20 +00:00
parent 944e61a799
commit 9ff777957e
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/richmemo/carbon/carbonrichmemo.pas
View File

@ -11,7 +11,7 @@ uses
Controls, Graphics,
RichMemoTypes, WSRichMemo,
WSRichMemo,
CarbonProc, CarbonEdits;
@ -89,7 +89,7 @@ procedure GetATSUFontRGBAColor(AStyle: ATSUStyle; var r,g,b,a: Byte);
var
rgba : ATSURGBAlphaColor;
begin
ATSUGetAttribute(AStyle, kATSURGBAlphaColorTag, sizeof(Boolean), @rgba, nil);
writeln('getting color= ', ATSUGetAttribute(AStyle, kATSURGBAlphaColorTag, sizeof(ATSURGBAlphaColor), @rgba, nil));
r := Round(rgba.red*255);
g := Round(rgba.green*255);
b := Round(rgba.blue*255);
@ -231,13 +231,13 @@ class function TCarbonWSCustomRichMemo.GetTextAttributes(const AWinControl: TWin
TextStart: Integer; var Params: TIntFontParams): Boolean;
var
edit : TCarbonRichEdit;
attr : array [0..1] of TXNTypeAttributes;
attr : array [0..2] of TXNTypeAttributes;
sstart : Integer;
slen : Integer;
flags : TXNContinuousFlags;
astyle : ATSUStyle;
maccolor : RGBColor;
begin
Result := false;
edit := GetValidRichEdit(AWinControl);
@ -252,10 +252,13 @@ begin
ATSUCreateStyle(astyle);
AttrSetATSUStyle(astyle, attr[0]);
AttrSetStyle([], attr[1]);
AttrSetColor(maccolor, attr[2]);
Result := edit.GetContinuousTypeAttributes(flags, 2, attr);
Result := edit.GetContinuousTypeAttributes(flags, 3, attr);
Params.Name := GetATSUFontName(astyle);
Params.Color := GetATSUFontColor(astyle);
Params.Color := RGBColorToColor(maccolor);
// GetATSUFontColor(astyle);
//writeln('got color: ', IntToHex(Params.Color, 8));
Params.Style := GetATSUFontStyles(astyle) + QDStyleToFontStyle(attr[1].data.dataValue);
Params.Size := GetATSUFontSize(astyle);

2
components/richmemo/samples/testsimple/project1.lpi
View File

@ -49,7 +49,7 @@
<IsPartOfProject Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="Unit1"/>
<CursorPos X="3" Y="10"/>
<CursorPos X="15" Y="10"/>
<TopLine Value="1"/>
<EditorIndex Value="0"/>
<UsageCount Value="49"/>