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

Many DPI fixes for customdrawn_common and Android support

Browse Source 
git-svn-id: trunk@34320 -
This commit is contained in:
sekelsenmat 2011-12-20 10:35:32 +00:00
parent 8744c46131
commit 1f545e968d
4 changed files with 93 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
lcl/customdrawn_common.pas
View File

@ -12,7 +12,7 @@ uses
// LCL -> Use only TForm, TWinControl, TCanvas and TLazIntfImage // LCL -> Use only TForm, TWinControl, TCanvas and TLazIntfImage
Graphics, Controls, LCLType, Graphics, Controls, LCLType,
// Others only for types // Others only for types
StdCtrls, ComCtrls, StdCtrls, ComCtrls, Forms,
// //
customdrawndrawers, ExtCtrls; customdrawndrawers, ExtCtrls;
@ -34,6 +34,7 @@ type
function GetColor(AColorID: Integer): TColor; override; function GetColor(AColorID: Integer): TColor; override;
function GetClientArea(ADest: TCanvas; ASize: TSize; AControlId: TCDControlID; function GetClientArea(ADest: TCanvas; ASize: TSize; AControlId: TCDControlID;
AState: TCDControlState; AStateEx: TCDControlStateEx): TRect; override; AState: TCDControlState; AStateEx: TCDControlStateEx): TRect; override;
function DPIAdjustment(const AValue: Integer): Integer;
// General drawing routines // General drawing routines
procedure DrawFocusRect(ADest: TCanvas; ADestPos: TPoint; ASize: TSize); override; procedure DrawFocusRect(ADest: TCanvas; ADestPos: TPoint; ASize: TSize); override;
procedure DrawRaisedFrame(ADest: TCanvas; ADestPos: TPoint; ASize: TSize); override; procedure DrawRaisedFrame(ADest: TCanvas; ADestPos: TPoint; ASize: TSize); override;
@ -159,8 +160,8 @@ begin
TCDEDIT_TOP_TEXT_SPACING: Result := 3; TCDEDIT_TOP_TEXT_SPACING: Result := 3;
TCDEDIT_BOTTOM_TEXT_SPACING: Result := 3; TCDEDIT_BOTTOM_TEXT_SPACING: Result := 3;
// //
TCDCHECKBOX_SQUARE_HALF_HEIGHT: Result := 7; TCDCHECKBOX_SQUARE_HALF_HEIGHT: Result := Floor(GetMeasures(TCDCHECKBOX_SQUARE_HEIGHT)/2);
TCDCHECKBOX_SQUARE_HEIGHT: Result := 15; TCDCHECKBOX_SQUARE_HEIGHT: Result := DPIAdjustment(15);
// //
TCDRADIOBUTTON_CIRCLE_HEIGHT: Result := 15; TCDRADIOBUTTON_CIRCLE_HEIGHT: Result := 15;
// //
@ -173,7 +174,7 @@ begin
TCDTRACKBAR_LEFT_SPACING: Result := 9; TCDTRACKBAR_LEFT_SPACING: Result := 9;
TCDTRACKBAR_RIGHT_SPACING: Result := 9; TCDTRACKBAR_RIGHT_SPACING: Result := 9;
TCDTRACKBAR_TOP_SPACING: Result := 5; TCDTRACKBAR_TOP_SPACING: Result := 5;
TCDTRACKBAR_FRAME_HEIGHT: Result := 17; TCDTRACKBAR_FRAME_HEIGHT: Result := DPIAdjustment(17);
// //
TCDLISTVIEW_COLUMN_LEFT_SPACING: Result := 10; TCDLISTVIEW_COLUMN_LEFT_SPACING: Result := 10;
TCDLISTVIEW_COLUMN_RIGHT_SPACING: Result := 10; TCDLISTVIEW_COLUMN_RIGHT_SPACING: Result := 10;
@ -303,6 +304,12 @@ begin
end; end;
end; end;
function TCDDrawerCommon.DPIAdjustment(const AValue: Integer): Integer;
begin
if Screen.PixelsPerInch <= 125 then Result := AValue
else Result := Round(AValue * Screen.PixelsPerInch / 125);
end;
procedure TCDDrawerCommon.DrawFocusRect(ADest: TCanvas; ADestPos: TPoint; procedure TCDDrawerCommon.DrawFocusRect(ADest: TCanvas; ADestPos: TPoint;
ASize: TSize); ASize: TSize);
begin begin
@ -436,15 +443,32 @@ end;
procedure TCDDrawerCommon.DrawTickmark(ADest: TCanvas; ADestPos: TPoint); procedure TCDDrawerCommon.DrawTickmark(ADest: TCanvas; ADestPos: TPoint);
var var
i: Integer; i: Integer;
lSpacing5, lFirstLinesEnd, lSecondLinesEnd: Integer;
begin begin
ADest.Pen.Color := clBlack; ADest.Pen.Color := clBlack;
ADest.Pen.Style := psSolid; ADest.Pen.Style := psSolid;
if Screen.PixelsPerInch <= 125 then
begin
// 4 lines going down and to the right
for i := 0 to 3 do
ADest.Line(ADestPos.X+2+i, ADestPos.Y+2+i, ADestPos.X+2+i, ADestPos.Y+5+i);
// Now 5 lines going up and to the right
for i := 4 to 8 do
ADest.Line(ADestPos.X+2+i, ADestPos.Y+2+6-i, ADestPos.X+2+i, ADestPos.Y+5+6-i);
Exit;
end;
lSpacing5 := DPIAdjustment(5);
lFirstLinesEnd := DPIAdjustment(4)-1;
lSecondLinesEnd := DPIAdjustment(9)-1;
// 4 lines going down and to the right // 4 lines going down and to the right
for i := 0 to 3 do for i := 0 to lFirstLinesEnd do
ADest.Line(ADestPos.X+2+i, ADestPos.Y+2+i, ADestPos.X+2+i, ADestPos.Y+5+i); ADest.Line(ADestPos.X+2+i, ADestPos.Y+2+i, ADestPos.X+2+i, ADestPos.Y+lSpacing5+i);
// Now 5 lines going up and to the right // Now 5 lines going up and to the right
for i := 4 to 8 do for i := lFirstLinesEnd+1 to lSecondLinesEnd do
ADest.Line(ADestPos.X+2+i, ADestPos.Y+2+6-i, ADestPos.X+2+i, ADestPos.Y+5+6-i); ADest.Line(ADestPos.X+2+i, ADestPos.Y+2+lFirstLinesEnd*2-i, ADestPos.X+2+i, ADestPos.Y+2+lFirstLinesEnd*2+lSpacing5-i);
end; end;
procedure TCDDrawerCommon.DrawSlider(ADest: TCanvas; ADestPos: TPoint; procedure TCDDrawerCommon.DrawSlider(ADest: TCanvas; ADestPos: TPoint;
@ -452,7 +476,11 @@ procedure TCDDrawerCommon.DrawSlider(ADest: TCanvas; ADestPos: TPoint;
var var
lPoints: array[0..4] of TPoint; lPoints: array[0..4] of TPoint;
lSliderBottom: Integer; lSliderBottom: Integer;
lSpacing5, lSpacing10: Integer;
begin begin
lSpacing5 := (ASize.cx-1)div 2;
lSpacing10 := (ASize.cx-1);
ADest.Brush.Color := Palette.BtnFace; ADest.Brush.Color := Palette.BtnFace;
ADest.Brush.Style := bsSolid; ADest.Brush.Style := bsSolid;
ADest.Pen.Color := WIN2000_FRAME_WHITE; ADest.Pen.Color := WIN2000_FRAME_WHITE;
@ -461,55 +489,55 @@ begin
begin begin
lSliderBottom := ADestPos.Y+ASize.CY; lSliderBottom := ADestPos.Y+ASize.CY;
// outter white frame // outter white frame
lPoints[0] := Point(ADestPos.X+5, lSliderBottom); lPoints[0] := Point(ADestPos.X+lSpacing5, lSliderBottom);
lPoints[1] := Point(ADestPos.X, lSliderBottom-5); lPoints[1] := Point(ADestPos.X, lSliderBottom-lSpacing5);
lPoints[2] := Point(ADestPos.X, ADestPos.Y); lPoints[2] := Point(ADestPos.X, ADestPos.Y);
lPoints[3] := Point(ADestPos.X+10, ADestPos.Y); lPoints[3] := Point(ADestPos.X+lSpacing10, ADestPos.Y);
lPoints[4] := Point(ADestPos.X+10, lSliderBottom-5); lPoints[4] := Point(ADestPos.X+lSpacing10, lSliderBottom-lSpacing5);
ADest.Polygon(lPoints); ADest.Polygon(lPoints);
// left-top inner frame // left-top inner frame
ADest.Pen.Color := WIN2000_FRAME_LIGHT_GRAY; ADest.Pen.Color := WIN2000_FRAME_LIGHT_GRAY;
ADest.MoveTo(ADestPos.X+5, lSliderBottom-1); ADest.MoveTo(ADestPos.X+lSpacing5, lSliderBottom-1);
ADest.LineTo(ADestPos.X+1, lSliderBottom-5); ADest.LineTo(ADestPos.X+1, lSliderBottom-lSpacing5);
ADest.LineTo(ADestPos.X+1, ADestPos.Y+1); ADest.LineTo(ADestPos.X+1, ADestPos.Y+1);
ADest.LineTo(ADestPos.X+9, ADestPos.Y+1); ADest.LineTo(ADestPos.X+lSpacing10-1, ADestPos.Y+1);
// right inner frame // right inner frame
ADest.Pen.Color := WIN2000_FRAME_GRAY; ADest.Pen.Color := WIN2000_FRAME_GRAY;
ADest.MoveTo(ADestPos.X+5, lSliderBottom-1); ADest.MoveTo(ADestPos.X+lSpacing5, lSliderBottom-1);
ADest.LineTo(ADestPos.X+9, lSliderBottom-5); ADest.LineTo(ADestPos.X+lSpacing10-1, lSliderBottom-lSpacing5);
ADest.LineTo(ADestPos.X+9, ADestPos.Y); ADest.LineTo(ADestPos.X+lSpacing10-1, ADestPos.Y);
// right outter frame // right outter frame
ADest.Pen.Color := WIN2000_FRAME_DARK_GRAY; ADest.Pen.Color := WIN2000_FRAME_DARK_GRAY;
ADest.MoveTo(ADestPos.X+5, lSliderBottom); ADest.MoveTo(ADestPos.X+lSpacing5, lSliderBottom);
ADest.LineTo(ADestPos.X+10, lSliderBottom-5); ADest.LineTo(ADestPos.X+lSpacing10, lSliderBottom-lSpacing5);
ADest.LineTo(ADestPos.X+10, ADestPos.Y-1); ADest.LineTo(ADestPos.X+lSpacing10, ADestPos.Y-1);
end end
else else
begin begin
lSliderBottom := ADestPos.Y+ASize.CY; lSliderBottom := ADestPos.Y+ASize.CY;
// outter white frame // outter white frame
lPoints[0] := Point(lSliderBottom, ADestPos.X+5); lPoints[0] := Point(lSliderBottom, ADestPos.X+lSpacing5);
lPoints[1] := Point(lSliderBottom-5, ADestPos.X); lPoints[1] := Point(lSliderBottom-lSpacing5, ADestPos.X);
lPoints[2] := Point(ADestPos.Y, ADestPos.X); lPoints[2] := Point(ADestPos.Y, ADestPos.X);
lPoints[3] := Point(ADestPos.Y, ADestPos.X+10); lPoints[3] := Point(ADestPos.Y, ADestPos.X+lSpacing10);
lPoints[4] := Point(lSliderBottom-5, ADestPos.X+10); lPoints[4] := Point(lSliderBottom-lSpacing5, ADestPos.X+lSpacing10);
ADest.Polygon(lPoints); ADest.Polygon(lPoints);
// left-top inner frame // left-top inner frame
ADest.Pen.Color := WIN2000_FRAME_LIGHT_GRAY; ADest.Pen.Color := WIN2000_FRAME_LIGHT_GRAY;
ADest.MoveTo(lSliderBottom-1, ADestPos.X+5); ADest.MoveTo(lSliderBottom-1, ADestPos.X+lSpacing5);
ADest.LineTo(lSliderBottom-5, ADestPos.X+1); ADest.LineTo(lSliderBottom-lSpacing5, ADestPos.X+1);
ADest.LineTo(ADestPos.Y+1, ADestPos.X+1); ADest.LineTo(ADestPos.Y+1, ADestPos.X+1);
ADest.LineTo(ADestPos.Y+1, ADestPos.X+9); ADest.LineTo(ADestPos.Y+1, ADestPos.X+lSpacing10-1);
// right inner frame // right inner frame
ADest.Pen.Color := WIN2000_FRAME_GRAY; ADest.Pen.Color := WIN2000_FRAME_GRAY;
ADest.MoveTo(lSliderBottom-1, ADestPos.X+5); ADest.MoveTo(lSliderBottom-1, ADestPos.X+lSpacing5);
ADest.LineTo(lSliderBottom-5, ADestPos.X+9); ADest.LineTo(lSliderBottom-lSpacing5, ADestPos.X+lSpacing10-1);
ADest.LineTo(ADestPos.Y, ADestPos.X+9); ADest.LineTo(ADestPos.Y, ADestPos.X+lSpacing10-1);
// right outter frame // right outter frame
ADest.Pen.Color := WIN2000_FRAME_DARK_GRAY; ADest.Pen.Color := WIN2000_FRAME_DARK_GRAY;
ADest.MoveTo(lSliderBottom, ADestPos.X+5); ADest.MoveTo(lSliderBottom, ADestPos.X+lSpacing5);
ADest.LineTo(lSliderBottom-5, ADestPos.X+10); ADest.LineTo(lSliderBottom-lSpacing5, ADestPos.X+lSpacing10);
ADest.LineTo(ADestPos.Y-1, ADestPos.X+10); ADest.LineTo(ADestPos.Y-1, ADestPos.X+lSpacing10);
end; end;
end; end;
@ -828,9 +856,10 @@ procedure TCDDrawerCommon.DrawCheckBox(ADest: TCanvas;
ASize: TSize; AState: TCDControlState; AStateEx: TCDControlStateEx); ASize: TSize; AState: TCDControlState; AStateEx: TCDControlStateEx);
var var
lColor: TColor; lColor: TColor;
lSquareHeight: Integer; lSquareHeight, lValue3: Integer;
begin begin
lSquareHeight := GetMeasures(TCDCHECKBOX_SQUARE_HEIGHT); lSquareHeight := GetMeasures(TCDCHECKBOX_SQUARE_HEIGHT);
lValue3 := DPIAdjustment(3);
// Background // Background
lColor := AStateEx.ParentRGBColor; lColor := AStateEx.ParentRGBColor;
@ -844,7 +873,7 @@ begin
// The Tickmark // The Tickmark
if csfOn in AState then if csfOn in AState then
DrawTickmark(ADest, Point(3, ASize.cy div 2 - GetMeasures(TCDCHECKBOX_SQUARE_HALF_HEIGHT)+3)); DrawTickmark(ADest, Point(lValue3, ASize.cy div 2 - GetMeasures(TCDCHECKBOX_SQUARE_HALF_HEIGHT)+lValue3));
// The text selection // The text selection
if csfHasFocus in AState then if csfHasFocus in AState then
@ -1191,7 +1220,10 @@ var
pStepWidth, lTickmarkLeftFloat: Double; pStepWidth, lTickmarkLeftFloat: Double;
lPoint: TPoint; lPoint: TPoint;
lSize, lMeasureSize: TSize; lSize, lMeasureSize: TSize;
lValue5, lValue11: Integer;
begin begin
lValue5 := DPIAdjustment(5);
lValue11 := DPIAdjustment(11);
// The orientation i // The orientation i
if csfHorizontal in AState then lMeasureSize := ASize if csfHorizontal in AState then lMeasureSize := ASize
else lMeasureSize := Size(ASize.CY, ASize.CX); else lMeasureSize := Size(ASize.CY, ASize.CX);
@ -1245,8 +1277,8 @@ begin
// Draw the slider // Draw the slider
if i = AStateEx.Position then if i = AStateEx.Position then
DrawSlider(ADest, DrawSlider(ADest,
Point(lTickmarkLeft-5, GetMeasures(TCDTRACKBAR_TOP_SPACING)-2), Point(lTickmarkLeft-lValue5, GetMeasures(TCDTRACKBAR_TOP_SPACING)-2),
Size(11, GetMeasures(TCDTRACKBAR_FRAME_HEIGHT)+5), AState); Size(lValue11, GetMeasures(TCDTRACKBAR_FRAME_HEIGHT)+lValue5), AState);
lTickmarkLeftFloat := lTickmarkLeftFloat + pStepWidth; lTickmarkLeftFloat := lTickmarkLeftFloat + pStepWidth;
lTickmarkLeft := Round(lTickmarkLeftFloat); lTickmarkLeft := Round(lTickmarkLeftFloat);

4
lcl/include/control.inc
View File

@ -3490,6 +3490,8 @@ begin
end end
else else
begin begin
// Give a shake at the autosize to recalculate font sizes for example
if AutoSize then AdjustSize();
NewWidth := Width; NewWidth := Width;
NewHeight := Height; NewHeight := Height;
end; end;
@ -3506,7 +3508,7 @@ end;
function TControl.ShouldAutoAdjustWidthAndHeight: Boolean; function TControl.ShouldAutoAdjustWidthAndHeight: Boolean;
begin begin
Result := AutoSize = False; Result := (Align = alNone) and (Anchors = [akTop, akLeft]) and (AutoSize = False);
end; end;
procedure TControl.UpdateAnchorRules; procedure TControl.UpdateAnchorRules;

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

@ -117,6 +117,8 @@ begin
Result := 0; Result := 0;
javaActivityObject := alclactivity; javaActivityObject := alclactivity;
Screen.UpdateScreen(); // Any values read before LCLOnCreate are wrong Screen.UpdateScreen(); // Any values read before LCLOnCreate are wrong
// Update the font size
CDWidgetset.DefaultFontAndroidSize := Round(16 * (Screen.PixelsPerInch / 125));
Application.Run; Application.Run;
end; end;
@ -241,6 +243,9 @@ begin
lForm.LCLForm.AutoAdjustLayout(lapAutoAdjustWithoutHorizontalScrolling, lForm.LCLForm.AutoAdjustLayout(lapAutoAdjustWithoutHorizontalScrolling,
lOldDPI, lNewDPI, lOldFormWidth, lNewFormWidth); lOldDPI, lNewDPI, lOldFormWidth, lNewFormWidth);
end; end;
// Update the font size
CDWidgetset.DefaultFontAndroidSize := Round(16 * (ANewDPI / 125));
end; end;
const NativeMethods: array[0..6] of JNINativeMethod= const NativeMethods: array[0..6] of JNINativeMethod=

37
lcl/interfaces/customdrawn/customdrawnwinapi_x11.inc
View File

@ -2785,42 +2785,35 @@ begin
{$endif} {$endif}
Result := 0; Result := 0;
(* if DC = 0 then if DC = 0 then DC := HDC(ScreenDC);
DC := HDC(QtScreenContext);
if not IsValidDC(DC) then exit; if not IsValidDC(DC) then exit;
QtDC := TQtDeviceContext(DC); LazDC := TLazCanvas(DC);
PaintEngine := QtDC.PaintEngine;
if PaintEngine = nil then
exit;
PaintDevice := QPaintEngine_paintDevice(PaintEngine);
case Index of case Index of
HORZSIZE: { HORZSIZE:
Result := QPaintDevice_widthMM(PaintDevice); Result := QPaintDevice_widthMM(PaintDevice);
VERTSIZE: VERTSIZE:
Result := QPaintDevice_heightMM(PaintDevice); Result := QPaintDevice_heightMM(PaintDevice);
HORZRES: HORZRES:
Result := QPaintDevice_width(PaintDevice); Result := QPaintDevice_width(PaintDevice);
BITSPIXEL: BITSPIXEL:
Result := QPaintDevice_depth(PaintDevice); Result := QPaintDevice_depth(PaintDevice);}
PLANES: PLANES:
Result := 1; Result := 1;
SIZEPALETTE: { SIZEPALETTE:
Result := QPaintDevice_numColors(PaintDevice); Result := QPaintDevice_numColors(PaintDevice);}
LOGPIXELSX: LOGPIXELSX: // DPI
Result := QPaintDevice_logicalDpiX(PaintDevice); Result := 96;
LOGPIXELSY: LOGPIXELSY: // DPI
Result := QPaintDevice_logicalDpiY(PaintDevice); Result := 96;
VERTRES: { VERTRES:
Result := QPaintDevice_height(PaintDevice); Result := QPaintDevice_height(PaintDevice);}
NUMRESERVED: NUMRESERVED:
Result := 0; Result := 0;
else else
Result := 0; Result := 0;
end;*) end;
end; end;
(*function TQtWidgetSet.GetDIBits(DC: HDC; Bitmap: HBitmap; StartScan, NumScans: UINT; Bits: Pointer; var BitInfo: BitmapInfo; Usage: UINT): Integer; (*function TQtWidgetSet.GetDIBits(DC: HDC; Bitmap: HBitmap; StartScan, NumScans: UINT; Bits: Pointer; var BitInfo: BitmapInfo; Usage: UINT): Integer;