From 1c5826f182fcc5f25fe13031a98007e895f332e3 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sun, 31 Jul 2016 21:58:26 +0000 Subject: [PATCH] tvplanit: Fix ChangeBounds loop in Element editor for Laz 1.4.4 git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5057 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/tvplanit/source/vpedelem.lfm | 316 ++++++++++++------------ components/tvplanit/source/vpedelem.pas | 7 +- 2 files changed, 166 insertions(+), 157 deletions(-) diff --git a/components/tvplanit/source/vpedelem.lfm b/components/tvplanit/source/vpedelem.lfm index f82f63d1a..cf0c6aac7 100644 --- a/components/tvplanit/source/vpedelem.lfm +++ b/components/tvplanit/source/vpedelem.lfm @@ -1,7 +1,7 @@ object frmEditElement: TfrmEditElement - Left = 691 + Left = 954 Height = 503 - Top = 226 + Top = 231 Width = 489 HorzScrollBar.Page = 378 VertScrollBar.Page = 444 @@ -12,10 +12,10 @@ object frmEditElement: TfrmEditElement OnCreate = FormCreate OnShow = FormShow Position = poScreenCenter - LCLVersion = '1.7' + LCLVersion = '1.4.4.0' object gbVisual: TGroupBox Left = 12 - Height = 148 + Height = 152 Top = 181 Width = 465 Align = alTop @@ -24,57 +24,18 @@ object frmEditElement: TfrmEditElement BorderSpacing.Top = 8 BorderSpacing.Right = 12 Caption = ' Visual ' - ClientHeight = 128 + ClientHeight = 132 ClientWidth = 461 TabOrder = 0 - object LblTop: TLabel - Left = 224 - Height = 15 - Top = 20 - Width = 23 - Caption = 'Top:' - FocusControl = edTop - ParentColor = False - end - object LblLeft: TLabel - Left = 224 - Height = 15 - Top = 48 - Width = 23 - Caption = 'Left:' - FocusControl = edLeft - ParentColor = False - end - object LblHeight: TLabel - Left = 352 - Height = 15 - Top = 20 - Width = 39 - BorderSpacing.Right = 4 - Caption = 'Height:' - FocusControl = edHeight - ParentColor = False - end - object LblWidth: TLabel - Left = 357 - Height = 15 - Top = 48 - Width = 35 - BorderSpacing.Right = 4 - Caption = 'Width:' - FocusControl = edWidth - ParentColor = False - end object rgMeasurement: TRadioGroup - AnchorSideLeft.Control = rgRotation - AnchorSideLeft.Side = asrBottom - Left = 103 - Height = 108 + Left = 104 + Height = 124 Top = 0 Width = 98 + Align = alLeft AutoFill = True AutoSize = True - BorderSpacing.Left = 7 + BorderSpacing.Left = 8 BorderSpacing.Bottom = 8 Caption = ' Measurement ' ChildSizing.LeftRightSpacing = 6 @@ -85,7 +46,7 @@ object frmEditElement: TfrmEditElement ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 88 + ClientHeight = 104 ClientWidth = 94 ItemIndex = 1 Items.Strings = ( @@ -98,13 +59,11 @@ object frmEditElement: TfrmEditElement TabOrder = 1 end object rgRotation: TRadioGroup - AnchorSideTop.Control = rgMeasurement - AnchorSideBottom.Control = rgMeasurement - AnchorSideBottom.Side = asrBottom Left = 8 - Height = 120 + Height = 124 Top = 0 Width = 88 + Align = alLeft AutoFill = True BorderSpacing.Left = 8 BorderSpacing.Bottom = 8 @@ -118,7 +77,7 @@ object frmEditElement: TfrmEditElement ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 100 + ClientHeight = 104 ClientWidth = 84 ItemIndex = 0 Items.Strings = ( @@ -129,111 +88,160 @@ object frmEditElement: TfrmEditElement ) TabOrder = 0 end - object edTop: TEdit - Left = 260 - Height = 23 - Top = 16 - Width = 48 - OnEnter = PosEditEnter - OnExit = PosEditExit + object Panel3: TPanel + Left = 202 + Height = 132 + Top = 0 + Width = 239 + Align = alLeft + BevelOuter = bvNone + ClientHeight = 132 + ClientWidth = 239 TabOrder = 2 - Text = '0.00' - end - object edLeft: TEdit - Left = 260 - Height = 23 - Top = 44 - Width = 48 - OnEnter = PosEditEnter - OnExit = PosEditExit - TabOrder = 4 - Text = '0.00' - end - object edHeight: TEdit - Left = 399 - Height = 23 - Top = 16 - Width = 40 - OnEnter = PosEditEnter - OnExit = PosEditExit - TabOrder = 6 - Text = '0.00' - end - object edWidth: TEdit - Left = 399 - Height = 23 - Top = 44 - Width = 40 - OnEnter = PosEditEnter - OnExit = PosEditExit - TabOrder = 8 - Text = '0.00' - end - object chkVisible: TCheckBox - Left = 260 - Height = 19 - Top = 80 - Width = 54 - Caption = 'Visible' - TabOrder = 10 - end - object udTop: TUpDown - Left = 308 - Height = 23 - Top = 16 - Width = 12 - Associate = edTop - Min = 0 - OnClick = UpDownClick - Position = 0 - TabOrder = 3 - Wrap = False - end - object udLeft: TUpDown - Left = 308 - Height = 23 - Top = 44 - Width = 12 - Associate = edLeft - Min = 0 - OnClick = UpDownClick - Position = 0 - TabOrder = 5 - Wrap = False - end - object udHeight: TUpDown - AnchorSideRight.Side = asrBottom - Left = 439 - Height = 23 - Top = 16 - Width = 12 - Associate = edHeight - BorderSpacing.Right = 8 - Min = 0 - OnClick = UpDownClick - Position = 0 - TabOrder = 7 - Wrap = False - end - object udWidth: TUpDown - AnchorSideRight.Side = asrBottom - Left = 439 - Height = 23 - Top = 44 - Width = 12 - Associate = edWidth - BorderSpacing.Right = 8 - Min = 0 - OnClick = UpDownClick - Position = 0 - TabOrder = 9 - Wrap = False + object LblTop: TLabel + Left = 8 + Height = 15 + Top = 28 + Width = 23 + Caption = 'Top:' + FocusControl = edTop + ParentColor = False + end + object LblHeight: TLabel + Left = 136 + Height = 15 + Top = 28 + Width = 39 + BorderSpacing.Right = 4 + Caption = 'Height:' + FocusControl = edHeight + ParentColor = False + end + object edTop: TEdit + Left = 44 + Height = 23 + Top = 24 + Width = 48 + OnEnter = PosEditEnter + OnExit = PosEditExit + TabOrder = 0 + Text = '0.00' + end + object edHeight: TEdit + Left = 183 + Height = 23 + Top = 24 + Width = 40 + OnEnter = PosEditEnter + OnExit = PosEditExit + TabOrder = 1 + Text = '0.00' + end + object udHeight: TUpDown + AnchorSideRight.Side = asrBottom + Left = 223 + Height = 23 + Top = 24 + Width = 12 + Associate = edHeight + BorderSpacing.Right = 8 + Min = 0 + OnClick = UpDownClick + Position = 0 + TabOrder = 2 + Wrap = False + end + object LblLeft: TLabel + Left = 8 + Height = 15 + Top = 60 + Width = 23 + Caption = 'Left:' + FocusControl = edLeft + ParentColor = False + end + object LblWidth: TLabel + Left = 141 + Height = 15 + Top = 60 + Width = 35 + BorderSpacing.Right = 4 + Caption = 'Width:' + FocusControl = edWidth + ParentColor = False + end + object edLeft: TEdit + Left = 44 + Height = 23 + Top = 56 + Width = 48 + OnEnter = PosEditEnter + OnExit = PosEditExit + TabOrder = 3 + Text = '0.00' + end + object edWidth: TEdit + Left = 183 + Height = 23 + Top = 56 + Width = 40 + OnEnter = PosEditEnter + OnExit = PosEditExit + TabOrder = 4 + Text = '0.00' + end + object udLeft: TUpDown + Left = 92 + Height = 23 + Top = 56 + Width = 12 + Associate = edLeft + Min = 0 + OnClick = UpDownClick + Position = 0 + TabOrder = 5 + Wrap = False + end + object udWidth: TUpDown + AnchorSideRight.Side = asrBottom + Left = 223 + Height = 23 + Top = 56 + Width = 12 + Associate = edWidth + BorderSpacing.Right = 8 + Min = 0 + OnClick = UpDownClick + Position = 0 + TabOrder = 6 + Wrap = False + end + object chkVisible: TCheckBox + Left = 48 + Height = 19 + Top = 88 + Width = 54 + Caption = 'Visible' + TabOrder = 7 + end + object udTop: TUpDown + Left = 92 + Height = 23 + Top = 24 + Width = 12 + Associate = edTop + Min = 0 + OnClick = UpDownClick + Position = 0 + TabOrder = 8 + Wrap = False + end end end object gbCaption: TGroupBox Left = 12 Height = 54 - Top = 337 + Top = 341 Width = 465 Align = alTop AutoSize = True @@ -412,7 +420,7 @@ object frmEditElement: TfrmEditElement object ButtonPanel: TPanel Left = 12 Height = 25 - Top = 399 + Top = 403 Width = 465 Align = alTop AutoSize = True diff --git a/components/tvplanit/source/vpedelem.pas b/components/tvplanit/source/vpedelem.pas index 4dbc96c56..5f4159393 100644 --- a/components/tvplanit/source/vpedelem.pas +++ b/components/tvplanit/source/vpedelem.pas @@ -57,6 +57,7 @@ type Panel2: TPanel; ButtonPanel: TPanel; ItemTypePanel: TPanel; + Panel3: TPanel; rgDayOffsetUnit: TRadioGroup; rgItemType: TRadioGroup; gbVisual: TGroupBox; @@ -341,7 +342,7 @@ begin // Position Left/Top etc controls w := Max(GetLabelWidth(lblLeft), GetLabelWidth(lblTop)); - edTop.Left := RightOf(rgMeasurement) + 2*DELTA + w + DELTA; + edTop.Left := 2*DELTA + w + DELTA; udTop.Left := RightOf(edTop); lblTop.Left := edTop.Left - DELTA - GetLabelWidth(lblTop); edLeft.Left := edTop.Left; @@ -349,14 +350,14 @@ begin lblLeft.Left := edLeft.Left - DELTA - GetLabelWidth(lblLeft); w := Max(GetLabelWidth(lblWidth), GetLabelWidth(lblHeight)); - edHeight.Left := RightOf(edTop) + 2*DELTA + w + DELTA; + edHeight.Left := RightOf(edTop) + 3*DELTA + w + DELTA; edWidth.Left := edHeight.Left; udHeight.Left := RightOf(edHeight); udWidth.Left := RightOf(edWidth); lblHeight.Left := edHeight.Left - DELTA - GetLabelWidth(lblHeight); lblWidth.Left := edWidth.Left - DELTA - GetLabelWidth(lblWidth); - chkVisible.Left := edTop.Left; + Panel3.Width := RightOf(udHeight) + 2*DELTA; // Buttons at the bottom w := Max(GetButtonWidth(btnOK), GetButtonWidth(btnCancel));