From 2c7d207ed5b8202d42a90ad5b09100b6f96e2ebf Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 18 Apr 2008 09:54:37 +0000
Subject: [PATCH] In TRxDBLookupCombo property DropDownCount now work

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@431 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/docs/WhatsNew.eng.txt |  2 +-
 components/rx/docs/WhatsNew.rus.txt |  1 +
 components/rx/rxpopupunit.pas       | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/components/rx/docs/WhatsNew.eng.txt b/components/rx/docs/WhatsNew.eng.txt
index df9f20772..4b15eb7cd 100644
--- a/components/rx/docs/WhatsNew.eng.txt
+++ b/components/rx/docs/WhatsNew.eng.txt
@@ -36,7 +36,7 @@
   - fix error with empty sring in TRxDateEdit.
   + In property  TRxDBLookupCombo.PopUpFormOptions add field  AutoFillColumns. Used in dropdown list.
   - Cleanup code in  TRxDBLookupCombo.Paint
-
+  + In TRxDBLookupCombo property DropDownCount now work
 29.08.2007 - ўҐабЁп 1.1.5.98 (svn revision 39)
   + In RxDBgrid - after close dataset  list of SelectedRows is cleared
   + fix resaizing find form for RxDbGrd    
diff --git a/components/rx/docs/WhatsNew.rus.txt b/components/rx/docs/WhatsNew.rus.txt
index 39a04146f..38402e690 100644
--- a/components/rx/docs/WhatsNew.rus.txt
+++ b/components/rx/docs/WhatsNew.rus.txt
@@ -43,6 +43,7 @@
   + В свойстве PopUpFormOptions компоненты TRxDBLookupCombo добавлено поле AutoFillColumns - аналог одноимённого поля
     из TDBGrid - используется в выпадающем списке
   - Улучшен код в отрисовке компоненты TRxDBLookupCombo
+  + В TRxDBLookupCombo работает свойство DropDownCount
 29.08.2007 - версия 1.1.5.98 (svn revision 39)
   + В RxDBGrid После закрытия набора данных список помеченных строк (SelectedRows) 
     очищается
diff --git a/components/rx/rxpopupunit.pas b/components/rx/rxpopupunit.pas
index f4c9ca804..f6447324d 100644
--- a/components/rx/rxpopupunit.pas
+++ b/components/rx/rxpopupunit.pas
@@ -161,6 +161,7 @@ type
     FDataSource:TDataSource;
     FOnPopUpCloseEvent:TPopUpCloseEvent;
     FPopUpFormOptions:TPopUpFormOptions;
+    FRowCount:word;
     function GetDataSet: TDataSet;
     function GetLookupDisplayIndex: integer;
     procedure SetDataSet(const AValue: TDataSet);
@@ -174,6 +175,7 @@ type
     procedure GridClickEvent(Column: TColumn);
     procedure CloseOk;
     procedure Paint;override;
+    procedure CreateWnd;override;
     //
     procedure DoSetFieldsFromString(FL:string);
     procedure DoSetFieldsFromColList;
@@ -334,6 +336,12 @@ begin
   end;
 end;
 
+procedure TPopUpForm.CreateWnd;
+begin
+  inherited CreateWnd;
+  Height:=FGrid.DefaultRowHeight * FRowCount;
+end;
+
 procedure TPopUpForm.DoSetFieldsFromString(FL: string);
 var
   FieldName:string;
@@ -481,7 +489,10 @@ begin
   FGrid.BorderStyle:=FPopUpFormOptions.BorderStyle;
   FGrid.OnGetCellProps:=FPopUpFormOptions.OnGetCellProps;
   FGrid.AutoFillColumns:=FPopUpFormOptions.AutoFillColumns;
-  
+  if FPopUpFormOptions.DropDownCount < 1 then
+    FRowCount:=10 + ord(dgTitles in FGrid.Options)
+  else
+    FRowCount:=FPopUpFormOptions.DropDownCount + 2 + ord(dgTitles in FGrid.Options);
 end;
 
 { TPopUpFormOptions }