From f68693281e29545b71d16cf79a80ba262049a854 Mon Sep 17 00:00:00 2001 From: juha Date: Wed, 23 Nov 2016 15:06:28 +0000 Subject: [PATCH] Packager: fix anchors in the AddPkgDependencyDialog. Patch from Ondrej. git-svn-id: trunk@53425 - --- packager/addpkgdependencydlg.lfm | 66 ++++++++++++++++---------------- packager/packageeditor.pas | 1 - 2 files changed, 33 insertions(+), 34 deletions(-) diff --git a/packager/addpkgdependencydlg.lfm b/packager/addpkgdependencydlg.lfm index e97954fa21..3331c7e08a 100644 --- a/packager/addpkgdependencydlg.lfm +++ b/packager/addpkgdependencydlg.lfm @@ -2,20 +2,21 @@ object AddPkgDependencyDialog: TAddPkgDependencyDialog Left = 466 Height = 373 Top = 122 - Width = 570 + Width = 495 + BorderIcons = [biSystemMenu] Caption = 'AddPkgDependencyDialog' ClientHeight = 373 - ClientWidth = 570 + ClientWidth = 495 OnClose = FormClose LCLVersion = '1.7' object DependPkgNameLabel: TLabel AnchorSideTop.Control = DependPkgNameFilter AnchorSideTop.Side = asrCenter AnchorSideRight.Control = DependPkgNameFilter - Left = 141 + Left = 61 Height = 18 - Top = 23 - Width = 141 + Top = 19 + Width = 138 Anchors = [akTop, akRight] BorderSpacing.Right = 6 BorderSpacing.CellAlignHorizontal = ccaLeftTop @@ -25,14 +26,13 @@ object AddPkgDependencyDialog: TAddPkgDependencyDialog end object DependPkgNameFilter: TListFilterEdit AnchorSideRight.Side = asrBottom - Left = 288 - Height = 32 + Left = 205 + Height = 24 Top = 16 - Width = 256 + Width = 284 ButtonWidth = 23 NumGlyphs = 1 - Anchors = [akTop] - AutoSize = False + Anchors = [akTop, akLeft, akRight] MaxLength = 0 TabOrder = 0 FilteredListbox = DependPkgNameListBox @@ -44,28 +44,29 @@ object AddPkgDependencyDialog: TAddPkgDependencyDialog AnchorSideRight.Control = DependPkgNameFilter AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = DependMinVersionEdit - Left = 288 - Height = 197 - Top = 54 - Width = 256 + Left = 205 + Height = 224 + Top = 46 + Width = 284 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Top = 6 BorderSpacing.Bottom = 6 ItemHeight = 0 MultiSelect = True + ScrollWidth = 282 TabOrder = 1 + TopIndex = -1 end object DependMinVersionEdit: TEdit AnchorSideLeft.Control = DependPkgNameListBox AnchorSideRight.Control = DependPkgNameListBox AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = DependMaxVersionEdit - Left = 288 - Height = 32 - Top = 257 - Width = 256 + Left = 205 + Height = 24 + Top = 276 + Width = 284 Anchors = [akLeft, akRight, akBottom] - AutoSize = False BorderSpacing.Top = 6 TabOrder = 2 Text = 'DependMinVersionEdit' @@ -76,12 +77,11 @@ object AddPkgDependencyDialog: TAddPkgDependencyDialog AnchorSideRight.Control = DependPkgNameListBox AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = ButtonPanel1 - Left = 288 - Height = 32 - Top = 292 - Width = 256 + Left = 205 + Height = 24 + Top = 303 + Width = 284 Anchors = [akLeft, akRight, akBottom] - AutoSize = False BorderSpacing.Top = 3 TabOrder = 3 Text = 'DependMaxVersionEdit' @@ -90,10 +90,10 @@ object AddPkgDependencyDialog: TAddPkgDependencyDialog AnchorSideTop.Control = DependMinVersionEdit AnchorSideTop.Side = asrCenter AnchorSideRight.Control = DependMinVersionEdit - Left = 132 + Left = 52 Height = 18 - Top = 264 - Width = 150 + Top = 279 + Width = 147 Anchors = [akTop, akRight] BorderSpacing.Right = 6 BorderSpacing.CellAlignHorizontal = ccaLeftTop @@ -106,10 +106,10 @@ object AddPkgDependencyDialog: TAddPkgDependencyDialog AnchorSideTop.Control = DependMaxVersionEdit AnchorSideTop.Side = asrCenter AnchorSideRight.Control = DependMaxVersionEdit - Left = 129 + Left = 49 Height = 18 - Top = 299 - Width = 153 + Top = 306 + Width = 150 Anchors = [akTop, akRight] BorderSpacing.Right = 6 BorderSpacing.CellAlignHorizontal = ccaLeftTop @@ -119,9 +119,9 @@ object AddPkgDependencyDialog: TAddPkgDependencyDialog end object ButtonPanel1: TButtonPanel Left = 6 - Height = 37 - Top = 330 - Width = 558 + Height = 34 + Top = 333 + Width = 483 OKButton.Name = 'OKButton' OKButton.DefaultCaption = True OKButton.OnClick = OKButtonClick diff --git a/packager/packageeditor.pas b/packager/packageeditor.pas index 007549e283..42bc8d81bc 100644 --- a/packager/packageeditor.pas +++ b/packager/packageeditor.pas @@ -2245,7 +2245,6 @@ begin exit(mrCancel); end; Result:=ShowAddPkgDependencyDlg(LazPackage, Deps); - DebugLn(['TPackageEditorForm.ShowAddDepDialog: Deps.Count=', Deps.Count]); try if (Result<>mrOk) or (Deps.Count=0) then exit; PackageGraph.BeginUpdate(false);