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

tvplanit: Minor improvements and cosmetic changes in shape editor.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5003 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-07-19 08:25:01 +00:00
parent ccc86f27cf
commit 4803397b14
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
components/tvplanit/source/vpedshape.pas
View File

@ -128,8 +128,8 @@ var
shape: TVpShapeType; shape: TVpShapeType;
w, h: Integer; w, h: Integer;
begin begin
w := SpeedButton1.Width - 8; w := SpeedButton1.Width div 2;
h := SpeedButton1.Height - 8; h := SpeedButton1.Height div 2;
for shape := Low(TVpShapeType) to High(TVpShapeType) do begin for shape := Low(TVpShapeType) to High(TVpShapeType) do begin
FShapeBitmaps[shape] := TBitmap.Create; FShapeBitmaps[shape] := TBitmap.Create;
with FShapeBitmaps[shape] do begin with FShapeBitmaps[shape] do begin
@ -300,8 +300,8 @@ procedure TfrmEditShape.PositionControls;
var var
w, h: Integer; w, h: Integer;
shape: TVpShapeType; shape: TVpShapeType;
delta: Integer; DELTA: Integer = 8;
vdist: Integer; VDIST: Integer = 4;
begin begin
// This is needed as workaround for the combobox height at higher dpi. // This is needed as workaround for the combobox height at higher dpi.
// We design it with Style csDropdown where the height is correct, and then // We design it with Style csDropdown where the height is correct, and then
@ -313,8 +313,8 @@ begin
cbBrushStyle.Style := csOwnerDrawFixed; cbBrushStyle.Style := csOwnerDrawFixed;
cbBrushStyle.ItemHeight := h+1; cbBrushStyle.ItemHeight := h+1;
delta := round(8 * Screen.PixelsPerInch / DesignTimeDPI); DELTA := round(DELTA * Screen.PixelsPerInch / DesignTimeDPI);
vdist := round(4 * Screen.PixelsPerInch / DesignTimeDPI); VDIST := round(VDIST * Screen.PixelsPerInch / DesignTimeDPI);
// Horizontal alignment // Horizontal alignment
w := MaxValue([GetLabelWidth(lblPenColor), GetLabelWidth(lblPenStyle), w := MaxValue([GetLabelWidth(lblPenColor), GetLabelWidth(lblPenStyle),
@ -328,6 +328,7 @@ begin
lblPenWidth.Left := cbPenColor.Left - GetLabelWidth(lblPenWidth) - DELTA; lblPenWidth.Left := cbPenColor.Left - GetLabelWidth(lblPenWidth) - DELTA;
lblPenMode.Left := cbPenColor.Left - GetLabelWidth(lblPenMode) - DELTA; lblPenMode.Left := cbPenColor.Left - GetLabelWidth(lblPenMode) - DELTA;
gbPen.Width := RightOf(cbPenColor) + DELTA; gbPen.Width := RightOf(cbPenColor) + DELTA;
udPenWidth.Left := RightOf(edPenWidth);
w := MaxValue([GetLabelWidth(lblBrushColor), GetLabelWidth(lblBrushStyle)]) + 2*DELTA; w := MaxValue([GetLabelWidth(lblBrushColor), GetLabelWidth(lblBrushStyle)]) + 2*DELTA;
cbBrushColor.Left := w; cbBrushColor.Left := w;
@ -358,22 +359,22 @@ begin
// Vertical alignment // Vertical alignment
lblPenColor.Top := cbPenColor.Top + (cbPenColor.Height - lblPenColor.Height) div 2; lblPenColor.Top := cbPenColor.Top + (cbPenColor.Height - lblPenColor.Height) div 2;
lblBrushColor.Top := lblPenColor.Top; lblBrushColor.Top := lblPenColor.Top;
cbPenStyle.Top := BottomOf(cbPenColor) + vdist; cbPenStyle.Top := BottomOf(cbPenColor) + VDIST;
cbBrushStyle.Top := cbPenStyle.Top; cbBrushStyle.Top := cbPenStyle.Top;
lblPenstyle.Top := cbPenStyle.Top + (cbPenStyle.Height - lblPenStyle.Height) div 2; lblPenstyle.Top := cbPenStyle.Top + (cbPenStyle.Height - lblPenStyle.Height) div 2;
lblBrushStyle.Top := lblPenStyle.Top; lblBrushStyle.Top := lblPenStyle.Top;
edPenWidth.Top := BottomOf(cbPenStyle) + vDist; edPenWidth.Top := BottomOf(cbPenStyle) + VDIST;
udPenWidth.Top := edPenWidth.Top; udPenWidth.Top := edPenWidth.Top;
lblPenWidth.Top := edPenWidth.Top + (edPenWidth.Height - lblPenWidth.Height) div 2; lblPenWidth.Top := edPenWidth.Top + (edPenWidth.Height - lblPenWidth.Height) div 2;
cbPenMode.Top := BottomOf(edPenWidth) + vDist; cbPenMode.Top := BottomOf(edPenWidth) + VDIST;
lblPenMode.Top := cbPenMode.Top + (cbPenMode.Height - lblPenMode.Height) div 2; lblPenMode.Top := cbPenMode.Top + (cbPenMode.Height - lblPenMode.Height) div 2;
gbPen.ClientHeight := BottomOf(cbPenMode) + delta; gbPen.ClientHeight := BottomOf(cbPenMode) + DELTA;
gbBrush.ClientHeight := BottomOf(cbBrushStyle) + delta; gbBrush.ClientHeight := BottomOf(cbBrushStyle) + DELTA;
btnOK.Top := BottomOf(gbPen) - btnOK.Height; btnOK.Top := BottomOf(gbPen) - btnOK.Height;
btnCancel.Top := btnOK.Top; btnCancel.Top := btnOK.Top;
ClientHeight := BottomOf(btnOK) + delta; ClientHeight := BottomOf(btnOK) + DELTA;
end; end;