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

wince: improves algorithm to place dialogs

Browse Source 
git-svn-id: trunk@18969 -
This commit is contained in:
sekelsenmat 2009-03-12 18:34:20 +00:00
parent a3fdb8c062
commit ebd943079c
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/interfaces/wince/wincewinapi.inc
View File

@ -882,7 +882,6 @@ begin
// TODO: use the real number of chars (and not the lenght)
W := Utf8Decode(S);
Result := Windows.ExtTextOutW(DC, X, Y, Options, LPRECT(Rect), PWideChar(W), Length(W), Dx);
// Result := Boolean(Windows.ExtTextOutW(DC, X, Y, Options, LPRECT(Rect), pWideStr, Count, Dx));
Assert(False, Format('trace:< [TWinCEWidgetSet.ExtTextOut] DC:0x%x, X:%d, Y:%d, Options:%d, Str:''%s'', Count: %d', [DC, X, Y, Options, Str, Count]));
end;

20
lcl/interfaces/wince/wincewsforms.pp
View File

@ -303,15 +303,21 @@ begin
Width := WR.Right - WR.Left;
end
else if (BorderStyle = bsDialog) then
{ On normal dialogs we need to take into consideration the size of
{
For dialogs, the window is put in the middle of the screen.
On normal dialogs we need to take into consideration the size of
the window decoration.
For the Top and Left coordinates, using CM_USEDEFAULT produces
a wrong and bad result. Using the Workarea rectagle works fine.
a wrong and bad result. Using the Workarea rectagle works fine
for most devices, but not all, so we put the dialog in the center.
}
begin
Top := WR.Top;
Left := WR.Left;
Top := WR.Top + (WR.Bottom - WR.Top) div 2
- (Bounds.Bottom - Bounds.Top) div 2;
Left := WR.Left + (WR.Right - WR.Left) div 2
- (Bounds.Right - Bounds.Left) div 2;
Height := Bounds.Bottom - Bounds.Top;
Width := Bounds.Right - Bounds.Left;
end
@ -377,8 +383,10 @@ begin
if (BorderStyle = bsDialog) then
begin
Windows.SystemParametersInfo(SPI_GETWORKAREA, 0, @WR, 0);
SizeRect.Top := WR.Top;
SizeRect.Left := WR.Left;
SizeRect.Top := WR.Top + (WR.Bottom - WR.Top) div 2
- AHeight div 2;
SizeRect.Left := WR.Left + (WR.Right - WR.Left) div 2
- AWidth div 2;
SizeRect.Bottom := SizeRect.Top + AHeight;
SizeRect.Right := SizeRect.Left + AWidth;
end;