minor fix in RxDBGrid and TRxDBLookupCombo

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@330 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/rx/docs/WhatsNew.eng.txt

@@ -20,6 +20,9 @@
   + In RxDBGrid create lookup editor for TField 
   - Fix error in TRxLookupEdit 
   + In RxDBGrid published new property from DBGrid
+  + Cosmetic fix in paint TRxCustomDBLookupCombo
+  + Dropdown list in TRxCustomDBLookupCombo show after clikc on component
+  + minor fix in RxDBGrid paint sort marker and column title
 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    

components/rx/docs/WhatsNew.rus.txt

@@ -23,6 +23,11 @@
   + ��� ��������� �������� Font � TRxDBLookupCombo ���������� ������ ���������� ���� �� �����
   + ���� � ������� TField ������������ �������� ��������� �� ��� �������������� � RxDBGrid 
     ������ ���� ���������� �������� �� ������ TRxDBLookupCombo
+  - ���������� ������ � ���������� TRxLookupEdit - �� ��������� ���������� ���������� ������
+  + � RxDBGrid ������������� ����������� ����
+  + ������������� ��������� ��������� TRxCustomDBLookupCombo
+  + ���������� ������ � TRxCustomDBLookupCombo ������������ ������ �� ����� �� ����������
+  + � RxDBGrid ���������� ��������� ������� ���������� � ��������� �������
 29.08.2007 - ������ 1.1.5.98 (svn revision 39)
   + � RxDBGrid ����� �������� ������ ������ ������ ���������� ����� (SelectedRows) 
     ���������

components/rx/rxdbgrid.pas

@@ -913,17 +913,22 @@ begin
     end;
 
     if TextOrient = toHorizontal then
-    begin
-      if Assigned(FTit) and (FTit.MCountLines>0) then
     begin
       aRect2:=aRect;
       aRect2.Left:=aRect2.Left - 2;
+      if ASortMarker <> smNone then
+        aRect2.Right := aRect2.Right - FMarkerDown.Width;
+
+      if Assigned(FTit) and (FTit.MCountLines>0) then
+      begin
         dW:=Canvas.TextHeight('W') + 4;
         for i:=0 to FTit.MCountLines-1 do
         begin
           FCap:=FTit.MGetLine(i);
           dww:=ATextWidth(FCap)  * dW;
           aRect2.Bottom:=aRect2.Top +  dww;
+
+
           WriteTextHeader(Canvas, aRect2, FCap, GetColumnAlignment(aCol, true));
           aRect2.Top:=aRect2.Top + dww;
           
@@ -939,7 +944,9 @@ begin
         end;
       end
       else
-        WriteTextHeader(Canvas, aRect, FCap, GetColumnAlignment(aCol, true))
+      begin
+        WriteTextHeader(Canvas, aRect2, FCap, GetColumnAlignment(aCol, true))
+      end;
     end
     else
     begin

components/rx/rxlookup.pas

@@ -195,6 +195,7 @@ type
     procedure Notification(AComponent: TComponent; Operation: TOperation); override;
     procedure CMVisibleChanged(var Msg: TLMessage); message CM_VISIBLECHANGED;
     procedure CMEnabledChanged(var Msg: TLMessage); message CM_ENABLEDCHANGED;
+    procedure MouseDown(Button: TMouseButton; Shift:TShiftState; X,Y:Integer); override;
     procedure Paint; override;
 
     procedure LookupDataSetChanged; virtual;
@@ -797,8 +798,8 @@ begin
   if FValuesList.Count=0 then exit;
   if ColorToRGB(Self.Color) <> ColorToRGB(clBtnFace) then
     ACanvas.Pen.Color := clBtnFace
-  else ACanvas.Pen.Color := clBtnShadow;
-//  LastIndex := FFieldList.Count-1;
+  else
+    ACanvas.Pen.Color := clBtnShadow;
   LastIndex := FValuesList.Count-1;
   TxtWidth := ACanvas.TextWidth('M');
   ATop := Max(0, (HeightOf(R) - ACanvas.TextHeight('Xy')) div 2);
@@ -981,7 +982,7 @@ end;
 
 procedure TRxCustomDBLookupCombo.DoAutoSize;
 begin
-  Height:=Canvas.TextHeight('Wg')+10;
+  Height:=Canvas.TextHeight('Wg')+12;
 end;
 
 procedure TRxCustomDBLookupCombo.SetEnabled(Value: Boolean);
@@ -1124,10 +1125,17 @@ begin
     FButton.Enabled:=Enabled;
 end;
 
+procedure TRxCustomDBLookupCombo.MouseDown(Button: TMouseButton;
+  Shift: TShiftState; X, Y: Integer);
+begin
+  inherited MouseDown(Button, Shift, X, Y);
+  DoButtonClick(Self);
+end;
+
 procedure TRxCustomDBLookupCombo.Paint;
 var
   Selected:boolean;
-  R: TRect;
+  R, R1: TRect;
   X, TextMargin: Integer;
   AText: string;
 begin
@@ -1157,12 +1165,12 @@ begin
   end;
   
   TextMargin := 0;
-  if ClientWidth > 4 then
+  if ClientWidth > 6 then
   begin
-    SetRect(R, 2, 2, ClientWidth - 2, ClientHeight - 2);
+    SetRect(R1, 3, 3, ClientWidth - 3, ClientHeight - 3);
     if TextMargin > 0 then Inc(TextMargin);
-    X := 2 + TextMargin;
-    Canvas.FillRect(R);
+    X := 3 + TextMargin;
+    Canvas.FillRect(R1);
     R.Right:=R.Right - GetButtonWidth;
     if FDisplayAll then
       PaintDisplayValues(Canvas, R, TextMargin)
@@ -1179,7 +1187,7 @@ begin
         AText:=FValuesList[FLookupDisplayIndex]
       else
         AText:='';
-      Canvas.TextRect(R, X, Max(0, (HeightOf(R) - Canvas.TextHeight(AText)) div 2), AText);
+      Canvas.TextRect(R, X, Max(0, (HeightOf(R) - Canvas.TextHeight('Wg')) div 2), AText);
     end
   end;
 end;

components/rx/tooledit.pas

@@ -93,7 +93,7 @@ type
     property CalendarStyle: TCalendarStyle read GetCalendarStyle
       write SetCalendarStyle default dcsDefault;
     property PopupVisible: Boolean read GetPopupVisible;
-    property PopupAlign: TPopupAlign read FPopupAlign write FPopupAlign default epaRight;
+    property PopupAlign: TPopupAlign read FPopupAlign write FPopupAlign default epaLeft;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -699,6 +699,7 @@ begin
   FBlanksChar := ' ';
   FDialogTitle := sDateDlgTitle;
   FPopupColor := clBtnFace;
+  FPopupAlign := epaLeft;
   FStartOfWeek := Mon;
   FWeekends := [Sun];
   FWeekendColor := clRed;

components/rx/vclutils.pas

@@ -14,8 +14,8 @@ uses
 type
   TTextOrientation = (toHorizontal, toVertical90, toHorizontal180, toVertical270, toHorizontal360);
 
-function WidthOf(R: TRect): Integer;
-function HeightOf(R: TRect): Integer;
+function WidthOf(R: TRect): Integer; inline;
+function HeightOf(R: TRect): Integer; inline;
 
 procedure RxFrame3D(Canvas: TCanvas; var Rect: TRect; TopColor, BottomColor: TColor;
   Width: Integer);