paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-02 11:20:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

carbon: update pen patternt to use the same as windows patterns for geometric pens, redo other pen code

Browse Source 
git-svn-id: trunk@17385 -
This commit is contained in:
paul 2008-11-14 08:24:12 +00:00
parent 94cc569029
commit 12ba8a4e4d
2 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lcl/interfaces/carbon/carbongdiobjects.pp
View File

@ -189,14 +189,13 @@ type
const
// Paul Ishenin:
// pen shapes are compared with windows shapes and now a bit to bit equal
// please dont remove multiplier, maybe we will change it later
osx_pen_multiplier = 3;
CarbonDashStyle: Array [0..1] of Single = (6*osx_pen_multiplier, 2*osx_pen_multiplier);
CarbonDotStyle: Array [0..1] of Single = (1*osx_pen_multiplier, 1*osx_pen_multiplier);
CarbonDashDotStyle: Array [0..3] of Single = (3*osx_pen_multiplier, 2*osx_pen_multiplier, 1*osx_pen_multiplier, 2*osx_pen_multiplier);
CarbonDashDotDotStyle: Array [0..5] of Single = (3*osx_pen_multiplier, 1*osx_pen_multiplier, 1*osx_pen_multiplier, 1*osx_pen_multiplier, 1*osx_pen_multiplier, 1*osx_pen_multiplier);
CarbonDashStyle: Array [0..1] of Single = (3, 1);
CarbonDotStyle: Array [0..1] of Single = (1, 1);
CarbonDashDotStyle: Array [0..3] of Single = (3, 1, 1, 1);
CarbonDashDotDotStyle: Array [0..5] of Single = (3, 1, 1, 1, 1, 1);
type
TCarbonDashes = array of Float32;
{ TCarbonPen }
@ -209,7 +208,7 @@ type
FEndCap: CGLineCap;
FJoinStyle: CGLineJoin;
public
Dashes: array of Float32;
Dashes: TCarbonDashes;
constructor Create(AGlobal: Boolean); // create default pen
constructor Create(ALogPen: TLogPen);
constructor Create(dwPenStyle, dwWidth: DWord; const lplb: TLogBrush; dwStyleCount: DWord; lpStyle: PDWord);
@ -1588,9 +1587,20 @@ end;
Applies pen to the specified context
------------------------------------------------------------------------------}
procedure TCarbonPen.Apply(ADC: TCarbonContext; UseROP2: Boolean);
function GetDashes(Source: TCarbonDashes): TCarbonDashes;
var
i: Integer;
begin
Result := Source;
for i := Low(Result) to High(Result) do
Result[i] := Result[i] * FWidth;
end;
var
AR, AG, AB, AA: Single;
AROP2: Integer;
ADashes: TCarbonDashes;
begin
if ADC = nil then Exit;
if ADC.CGContext = nil then Exit;
@ -1618,16 +1628,28 @@ begin
end;
case FStyle of
PS_DASH: CGContextSetLineDash(ADC.CGContext, 0, @CarbonDashStyle[0],
Length(CarbonDashStyle));
PS_DOT: CGContextSetLineDash(ADC.CGContext, 0, @CarbonDotStyle[0],
Length(CarbonDotStyle));
PS_DASHDOT: CGContextSetLineDash(ADC.CGContext, 0, @CarbonDashDotStyle[0],
Length(CarbonDashDotStyle));
PS_DASHDOTDOT: CGContextSetLineDash(ADC.CGContext, 0, @CarbonDashDotDotStyle[0],
Length(CarbonDashDotDotStyle));
PS_USERSTYLE: CGContextSetLineDash(ADC.CGContext, 0, @Dashes[0],
Length(Dashes));
PS_DASH:
begin
ADashes := GetDashes(CarbonDashStyle);
CGContextSetLineDash(ADC.CGContext, 0, @ADashes[0], Length(ADashes));
end;
PS_DOT:
begin
ADashes := GetDashes(CarbonDotStyle);
CGContextSetLineDash(ADC.CGContext, 0, @ADashes[0], Length(ADashes));
end;
PS_DASHDOT:
begin
ADashes := GetDashes(CarbonDashDotStyle);
CGContextSetLineDash(ADC.CGContext, 0, @ADashes[0], Length(ADashes));
end;
PS_DASHDOTDOT:
begin
ADashes := GetDashes(CarbonDashDotDotStyle);
CGContextSetLineDash(ADC.CGContext, 0, @ADashes[0], Length(ADashes));
end;
PS_USERSTYLE:
CGContextSetLineDash(ADC.CGContext, 0, @Dashes[0], Length(Dashes));
else
CGContextSetLineDash(ADC.CGContext, 0, nil, 0);
end;

16
lcl/interfaces/carbon/carbonwsdialogs.pp
View File

@ -429,8 +429,9 @@ end; {TCarbonWSFileDialog.ShowModal}
class procedure TCarbonWSColorDialog.ShowModal(
const ACommonDialog: TCommonDialog);
var
ColorInfo: ColorPickerInfo;
ColorInfo: NColorPickerInfo;
ColorDialog: TColorDialog;
Profile: CMProfileRef;
begin
{$IFDEF VerboseWSClass}
DebugLn('TCarbonWSColorDialog.ShowModal for ' + ACommonDialog.Name);
@ -439,19 +440,20 @@ begin
ACommonDialog.UserChoice := mrCancel;
ColorDialog := ACommonDialog as TColorDialog;
CMGetDefaultProfileBySpace(cmRGBData, Profile);
FillChar(ColorInfo, SizeOf(ColorPickerInfo), 0);
ColorInfo.theColor.color.rgb := CMRGBColor(ColorToRGBColor(ColorDialog.Color));
ColorInfo.theColor.profile := nil;
ColorInfo.dstProfile := nil;
ColorInfo.flags := kColorPickerDialogIsModal or kColorPickerDialogIsMoveable or
kColorPickerInPickerDialog;
ColorInfo.theColor.profile := Profile;
ColorInfo.dstProfile := Profile;
ColorInfo.flags := kColorPickerDialogIsModal or
kColorPickerDialogIsMoveable;
ColorInfo.placeWhere := kCenterOnMainScreen;
ColorInfo.pickerType := 0; // use last picker subtype
ColorInfo.eventProc := nil;
ColorInfo.colorProc := nil;
// ColorDialog.Title is ignored, ColorInfo.prompt is not shown anywhere
ColorInfo.prompt := ColorDialog.Title; // ColorDialog.Title is ignored, ColorInfo.prompt is not shown anywhere
if OSError(PickColor(ColorInfo), Self, SShowModal, 'PickColor') then Exit;
if OSError(NPickColor(ColorInfo), Self, SShowModal, 'PickColor') then Exit;
if ColorInfo.newColorChosen then
begin