tvplanit: Improve keyboard handling of VpContactGrid. Some refactoring of painting code.

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

components/tvplanit/examples/datastores/xml/project1.lpi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <SessionStorage Value="InProjectDir"/>
@@ -17,9 +17,10 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
+      <FormatVersion Value="2"/>
-        <FormatVersion Value="1"/>
+      <Modes Count="1">
-      </local>
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>

components/tvplanit/examples/datastores/xml/unit1.lfm

@@ -7,7 +7,8 @@ object Form1: TForm1
   ClientHeight = 686
   ClientWidth = 980
   OnCreate = FormCreate
-  LCLVersion = '1.6.4.0'
+  OnDestroy = FormDestroy
+  LCLVersion = '1.9.0.0'
   object Panel1: TPanel
     Left = 0
     Height = 33
@@ -170,7 +171,6 @@ object Form1: TForm1
           Align = alBottom
           TabStop = True
           TabOrder = 1
-          KBNavigation = True
           DateLabelFormat = 'mmmm yyyy'
           DayHeadAttributes.Font.Height = -13
           DayHeadAttributes.Font.Name = 'Tahoma'
@@ -181,6 +181,7 @@ object Form1: TForm1
           EventDayStyle = []
           EventFont.Height = -12
           HeadAttributes.Color = clBtnFace
+          KBNavigation = True
           OffDayColor = clSilver
           SelectedDayColor = clRed
           ShowEvents = True
@@ -245,20 +246,21 @@ object Form1: TForm1
     end
     object TabSheet2: TTabSheet
       Caption = 'Contacts'
-      ClientHeight = 624
+      ClientHeight = 625
       ClientWidth = 972
       object VpContactButtonBar1: TVpContactButtonBar
         Left = 0
-        Height = 624
+        Height = 625
         Top = 0
         Width = 40
+        ContactGrid = VpContactGrid1
         DrawingStyle = dsFlat
         RadioStyle = False
         Align = alLeft
       end
       object VpContactGrid1: TVpContactGrid
         Left = 40
-        Height = 624
+        Height = 625
         Top = 0
         Width = 932
         DataStore = VpXmlDatastore1
@@ -295,7 +297,7 @@ object Form1: TForm1
     top = 264
   end
   object VpResourceEditDialog1: TVpResourceEditDialog
-    Version = 'v1.05'
+    Version = 'v1.12'
     DataStore = VpXmlDatastore1
     Options = []
     Placement.Position = mpCenter

components/tvplanit/examples/datastores/xml/unit1.pas

@@ -39,6 +39,7 @@ type
     procedure BtnNewResClick(Sender: TObject);
     procedure BtnEditResClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
   private
     { private declarations }
   public
@@ -86,5 +87,10 @@ begin
   end;
 end;
 
+procedure TForm1.FormDestroy(Sender: TObject);
+begin
+  VpXMLDatastore1.Connected := false;
+end;
+
 end.
 

components/tvplanit/source/vpcontactgrid.pas

@@ -192,6 +192,7 @@ type
     procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X,Y: Integer); override;
     procedure MouseMove(Shift: TShiftState; X, Y: Integer); override;
     procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
+    procedure ScrollIntoView;
     procedure PopupAddContact(Sender: TObject);
     procedure PopupAddVCards(Sender: TObject);
     procedure PopupDeleteContact(Sender: TObject);
@@ -242,7 +243,7 @@ type
       DisplayOnly: Boolean); override;
 
     { - Added to support the buttonbar component.                         }
-    function SelectContactByName(const Name: String): Boolean;           
+    function SelectContactByName(const Name: String): Boolean;
 
     {$IF VP_LCL_SCALING = 2}
     procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
@@ -787,6 +788,23 @@ begin
   end;
 end;
 
+procedure TVpContactGrid.ScrollIntoView;
+begin
+  if FContactIndex < FContactsBefore then begin
+    FContactsBefore := FContactIndex;
+    Invalidate;
+  end else begin
+    if FContactIndex > FContactsBefore + FVisibleContacts - 2 then begin
+      FContactsBefore := FContactIndex - FVisibleContacts + 2;
+      Invalidate;
+    end;
+    while ContactIndex > FContactsBefore + FVisibleContacts - 2 do begin
+      inc(FContactsBefore);
+      Invalidate;
+    end;
+  end;
+end;
+
 { Introduced to support the buttonbar component                           !!.02}
 function TVpContactGrid.SelectContactByName(const Name: String): Boolean;
 var
@@ -1576,51 +1594,46 @@ end;
 procedure TVpContactGrid.KeyDown(var Key: Word; Shift: TShiftState);
 var
   PopupPoint: TPoint;
+  idx: Integer;
+  contactCount: Integer;
 begin
+  contactCount := DataStore.Resource.Contacts.Count;
   case Key of
-    VK_UP    :
+    VK_UP:
       if ContactIndex > 0 then
         ContactIndex := ContactIndex - 1;
-    VK_DOWN  :
+    VK_DOWN:
-      if ContactIndex < DataStore.Resource.Contacts.Count - 1 then
+      if ContactIndex < contactCount - 1 then
         ContactIndex := ContactIndex + 1;
-    VK_HOME  :
+    VK_HOME:
       ContactIndex := 0;
-    {
+    VK_END:
-      if ContactIndex > 0 then
+      ContactIndex := contactCount - 1;
-        ContactIndex := ContactIndex - 1;
+    VK_RIGHT:
-        }
+      if ContactIndex + cgCol1RecCount <= contactCount - 1 then
-    VK_END   :
-      ContactIndex := Datastore.Resource.Contacts.Count - 1;
-    {
-      if ContactIndex < Pred(DataStore.Resource.Contacts.Count) then
-        ContactIndex := ContactIndex + 1;
-        }
-    VK_RIGHT :
-      if ContactIndex + cgCol1RecCount <= DataStore.Resource.Contacts.Count - 1 then
         ContactIndex := ContactIndex + cgCol1RecCount
       else
-        ContactIndex := DataStore.Resource.Contacts.Count - 1;
+        ContactIndex := contactCount - 1;
-    VK_LEFT :
+    VK_LEFT:
       if ContactIndex - cgCol1RecCount <= 0 then
         ContactIndex := 0
       else
         ContactIndex := ContactIndex - cgCol1RecCount;
-    VK_DELETE :
+    VK_DELETE:
       DeleteActiveContact (true);
 {$IFNDEF LCL}
-    VK_TAB   :
+    VK_TAB:
       if ssShift in Shift then
         Windows.SetFocus (GetNextDlgTabItem(GetParent(Handle), Handle, False))
       else
         Windows.SetFocus (GetNextDlgTabItem(GetParent(Handle), Handle, True));
 {$ENDIF}
-    VK_F10   :
+    VK_F10:
       if (ssShift in Shift) and not Assigned(PopupMenu) then begin
         PopupPoint := GetClientOrigin;
         FDefaultPopup.Popup(PopupPoint.x + 10, PopupPoint.y + 10);
       end;
-    VK_APPS  :
+    VK_APPS:
       if not Assigned(PopupMenu) then begin
         PopupPoint := GetClientOrigin;
         FDefaultPopup.Popup(PopupPoint.x + 10, PopupPoint.y + 10);
@@ -1629,8 +1642,9 @@ begin
       inherited;
   end;
 
-  Key := 0;
   Invalidate;
+  ScrollIntoView;
+  Key := 0;
   inherited;
 end;
 {=====}

components/tvplanit/source/vpcontactgridpainter.pas

@@ -237,7 +237,11 @@ var
   Phone4Rect: TRect = (Left:0; Top:0; Right:0; Bottom:0);
   Phone5Rect: TRect = (Left:0; Top:0; Right:0; Bottom:0);
   R: TRect;
+  contactCount: Integer;
+  baseTextHeight: Integer;
+  maxTextWidth: Integer;
 begin
+  contactCount := FContactGrid.DataStore.Resource.Contacts.Count;
   oldCol1RecCount := TVpContactGridOpener(FContactGrid).cgCol1RecCount;
   TVpContactGridOpener(FContactGrid).FVisibleContacts := 0;
   TVpContactGridOpener(FContactGrid).cgCol1RecCount := 0;
@@ -271,6 +275,7 @@ begin
     {$IF VP_LCL_SCALING = 0}
     TmpBmp.Canvas.Font.Size := ScaleY(TmpBmp.Canvas.Font.Size, DesignTimeDPI);
     {$ENDIF}
+    baseTextHeight := TmpBmp.Canvas.TextHeight(VpProductName);
 
     { Calculate Phone Lbl Width }
     PhoneLblWidth := TmpBmp.Canvas.TextWidth(RSEmail);
@@ -308,15 +313,15 @@ begin
     end;
     RecsInCol := 0;
 
-    for I := StartContact to pred(FContactGrid.DataStore.Resource.Contacts.Count) do begin
+    for I := StartContact to pred(contactCount) do begin
       TmpCon := FContactGrid.DataStore.Resource.Contacts.GetContact(I);
       if (TmpCon <> nil) then begin
+        TVpContactGridOpener(FContactGrid).cgContactArray[I].Contact := TmpCon;
+
         { Clear bmp canvas }
         TmpBmp.Canvas.Brush.Color := RealColor;
         TmpBmp.Canvas.FillRect(Rect(0, 0, TmpBmp.Width, TmpBmp.Height));
 
-        TVpContactGridOpener(FContactGrid).cgContactArray[I].Contact := TmpCon;
-
         { start building the WholeRect and build the HeaderRect}
         TmpBmp.Canvas.Pen.Color := BevelDarkShadow;
         TmpBmp.Canvas.Brush.Style := bsSolid;
@@ -335,14 +340,14 @@ begin
               HeadRect.TopLeft := Point(0, 0);
               HeadRect.BottomRight := Point(
                 TmpBmp.Width,
-                HeadRect.Top + TmpBmp.Canvas.TextHeight(VpProductName) + TextMargin div 2
+                HeadRect.Top + baseTextHeight + TextMargin div 2
               );
               WholeRect.BottomRight := HeadRect.BottomRight;
             end;
-          ra90:                                         // TO DO: CHECK THE USAGE OF TextMargin HERE !!!!!!!!!
+          ra90:                      // TO DO: CHECK CORRECT USAGE OF TextMargin HERE !!!!!!!!!
             begin
               HeadRect.TopLeft := Point(
-                TmpBmpRect.Right - TextMargin - TmpBmp.Canvas.TextHeight(VpProductName) + TextMargin div 2,
+                TmpBmpRect.Right - TextMargin - baseTextHeight + TextMargin div 2,
                 0
               );
               HeadRect.BottomRight := Point(TmpBmpRect.Right, TmpBmp.Height);
@@ -354,7 +359,7 @@ begin
               WholeRect.BottomRight := Point(TmpBmp.Width, TmpBmp.Height);
               HeadRect.TopLeft := Point(
                 TextMargin,
-                TmpBmpRect.Bottom - TmpBmp.Canvas.TextHeight(VpProductName) - TextMargin
+                TmpBmpRect.Bottom - baseTextHeight - TextMargin
               );
               HeadRect.BottomRight := Point(
                 TmpBmp.Width,
@@ -367,112 +372,110 @@ begin
               WholeRect.TopLeft := Point(0, 0);
               HeadRect.TopLeft := Point(0, TextMargin);
               HeadRect.BottomRight := Point(
-                TextMargin + TmpBmp.Canvas.TextHeight(VpProductName) + TextMargin div 2,
+                TextMargin + baseTextHeight + TextMargin div 2,
                 TmpBmp.Height
               );
               WholeRect.BottomRight := HeadRect.BottomRight;
             end;
         end;
 
-        { assemble the header string }
+        { paint the header cell's background }
-        Str := AssembleName(TmpCon);
+        TmpBmp.Canvas.Brush.Color := RealContactHeadAttrColor;
+        TmpBmp.Canvas.FillRect(HeadRect);
 
-        { if the name isn't empty then paint all of the contact information }
+        { paint the header cell's border }
-        if Str > '' then begin
+        if FContactGrid.ContactHeadAttributes.Bordered and (FContactGrid.DrawingStyle <> dsNoBorder)
-          { paint the header cell's background }
+        then begin
-          if (Angle = ra0) or (Angle = ra180) then
-            Str := GetDisplayString(TmpBmp.Canvas, Str, 2, WidthOf(HeadRect) - TextMargin)
-          else
-            Str := GetDisplayString(TmpBmp.Canvas, Str, 2, HeightOf(HeadRect) - TextMargin);
-          TmpBmp.Canvas.Brush.Color := RealContactHeadAttrColor;
-          TmpBmp.Canvas.FillRect(HeadRect);
-          { paint the header cell's border }
-          if FContactGrid.ContactHeadAttributes.Bordered and (FContactGrid.DrawingStyle <> dsNoBorder)
-          then begin
-            TmpBmp.Canvas.Pen.Style := psSolid;
-            {$IFDEF VERSION5}
-            TmpBmp.Canvas.Rectangle(HeadRect);
-            {$ELSE}
-            TmpBmp.Canvas.Rectangle(HeadRect.Left, HeadRect.Top, HeadRect.Right, HeadRect.Bottom);
-            {$ENDIF}
-          end;
-          { paint the header cell's text }
-          case Angle of
-            ra90:
-              begin
-                TextXOffset := WidthOf(HeadRect) - TextMargin div 2;
-                TextYOffset := TextMargin div 3;
-              end;
-            ra180:
-              begin
-                TextXOffset := WidthOf(HeadRect) - TextMargin;
-                TextYOffset := HeightOf(HeadRect) - TextMargin div 3;
-              end;
-            ra270:
-              begin
-                TextXOffset := TextMargin div 2;
-                TextYOffset := HeightOf(HeadRect) - TextMargin div 3;
-              end;
-          end;
-          TPSTextOutAtPoint(
-            TmpBmp.Canvas,
-            Angle,
-            TmpBmpRect,
-            HeadRect.Left + TextMargin div 2 + TextXOffset,
-            HeadRect.Top + TextMargin div 3 + TextYOffset,
-            Str
-          );
-
-          { restore font and colors }
-          TmpBmp.Canvas.Font.Assign(FContactGrid.Font);
-          {$IF VP_LCL_SCALING = 0}
-          TmpBmp.Canvas.Font.Size := ScaleY(TmpBmp.Canvas.Font.Size, DesignTimeDPI);
-          {$ENDIF}
-          TmpBmp.Canvas.Brush.Color := RealColor;
-          TmpBmp.Canvas.Pen.Color := BevelDarkShadow;
           TmpBmp.Canvas.Pen.Style := psSolid;
+          TmpBmp.Canvas.Rectangle(HeadRect);
+        end;
 
-          { do Company }
+        { paint the header cell's text }
-          DrawContactLine(TmpBmp, TmpCon.Company, '', WholeRect, CompanyRect);
+        case Angle of
+          ra90:
+            begin
+              TextXOffset := WidthOf(HeadRect) - TextMargin div 2;
+              TextYOffset := TextMargin div 3;
+            end;
+          ra180:
+            begin
+              TextXOffset := WidthOf(HeadRect) - TextMargin;
+              TextYOffset := HeightOf(HeadRect) - TextMargin div 3;
+            end;
+          ra270:
+            begin
+              TextXOffset := TextMargin div 2;
+              TextYOffset := HeightOf(HeadRect) - TextMargin div 3;
+            end;
+        end;
 
-          { do address... }
+        { assemble the header string }
-          DrawContactLine(TmpBmp, TmpCon.Address1, '', WholeRect, AddrRect);
+        if (Angle in [ra0, ra180]) then
+          maxTextWidth := WidthOf(HeadRect)
+        else
+          maxTextWidth := HeightOf(HeadRect);
+        Str := AssembleName(TmpCon);
+        Str := GetDisplayString(TmpBmp.Canvas, Str, 2, maxTextWidth - TextMargin);
 
-          { do City, State, Zip }
+        TPSTextOutAtPoint(
-          Str := AssembleCSZ(TmpCon, 1, FContactGrid.GetCityStateZipFormat);
+          TmpBmp.Canvas,
-          DrawContactLine(TmpBmp, Str, '', WholeRect, CSZRect);
+          Angle,
+          TmpBmpRect,
+          HeadRect.Left + TextMargin div 2 + TextXOffset,
+          HeadRect.Top + TextMargin div 3 + TextYOffset,
+          Str
+        );
 
-          { do Phone1 }
+        { restore font and colors }
-          Str := PhoneLabel(TVpPhoneType(TmpCon.PhoneType1)) + ': ';
+        TmpBmp.Canvas.Font.Assign(FContactGrid.Font);
-          DrawContactLine(TmpBmp, TmpCon.Phone1, Str, WholeRect, Phone1Rect);
+        {$IF VP_LCL_SCALING = 0}
+        TmpBmp.Canvas.Font.Size := ScaleY(TmpBmp.Canvas.Font.Size, DesignTimeDPI);
+        {$ENDIF}
+        TmpBmp.Canvas.Brush.Color := RealColor;
+        TmpBmp.Canvas.Pen.Color := BevelDarkShadow;
+        TmpBmp.Canvas.Pen.Style := psSolid;
 
-          { do Phone2 }
+        { do Company }
-          Str := PhoneLabel(TVpPhoneType(TmpCon.PhoneType2)) + ': ';
+        DrawContactLine(TmpBmp, TmpCon.Company, '', WholeRect, CompanyRect);
-          DrawContactLine(TmpBmp, TmpCon.Phone2, Str, WholeRect, Phone2Rect);
 
-          { do Phone3 }
+        { do address... }
-          Str := PhoneLabel(TVpPhoneType(TmpCon.PhoneType3)) + ': ';
+        DrawContactLine(TmpBmp, TmpCon.Address1, '', WholeRect, AddrRect);
-          DrawContactLine(TmpBmp, TmpCon.Phone3, Str, WholeRect, Phone3Rect);
 
-          { do Phone4 }
+        { do City, State, Zip }
-          Str := PhoneLabel(TVpPhoneType(TmpCon.PhoneType4)) + ': ';
+        Str := AssembleCSZ(TmpCon, 1, FContactGrid.GetCityStateZipFormat);
-          DrawContactLine(TmpBmp, TmpCon.Phone4, Str, WholeRect, Phone4Rect);
+        DrawContactLine(TmpBmp, Str, '', WholeRect, CSZRect);
 
-          { do Phone5 }
+        { do Phone1 }
-          Str := PhoneLabel(TVpPhoneType(TmpCon.PhoneType5)) + ': ';
+        Str := PhoneLabel(TVpPhoneType(TmpCon.PhoneType1)) + ': ';
-          DrawContactLine(TmpBmp, TmpCon.Phone5, Str, WholeRect, Phone5Rect);
+        DrawContactLine(TmpBmp, TmpCon.Phone1, Str, WholeRect, Phone1Rect);
 
-          { do EMail }
+        { do Phone2 }
-          Str := TVpContactGridOpener(FContactGrid).GetDisplayEMailValue(TmpCon);
+        Str := PhoneLabel(TVpPhoneType(TmpCon.PhoneType2)) + ': ';
-          DrawContactLine(TmpBmp, Str, RSEmail + ': ', WholeRect, EMailRect);
+        DrawContactLine(TmpBmp, TmpCon.Phone2, Str, WholeRect, Phone2Rect);
 
-          { if this record's too big to fit in the remaining area of this }
+        { do Phone3 }
-          { column, then slide over to the top of the next column }
+        Str := PhoneLabel(TVpPhoneType(TmpCon.PhoneType3)) + ': ';
+        DrawContactLine(TmpBmp, TmpCon.Phone3, Str, WholeRect, Phone3Rect);
+
+        { do Phone4 }
+        Str := PhoneLabel(TVpPhoneType(TmpCon.PhoneType4)) + ': ';
+        DrawContactLine(TmpBmp, TmpCon.Phone4, Str, WholeRect, Phone4Rect);
+
+        { do Phone5 }
+        Str := PhoneLabel(TVpPhoneType(TmpCon.PhoneType5)) + ': ';
+        DrawContactLine(TmpBmp, TmpCon.Phone5, Str, WholeRect, Phone5Rect);
+
+        { do EMail }
+        Str := TVpContactGridOpener(FContactGrid).GetDisplayEMailValue(TmpCon);
+        DrawContactLine(TmpBmp, Str, RSEmail + ': ', WholeRect, EMailRect);
+
+        { if this record's too big to fit in the remaining area of this }
+        { column, then slide over to the top of the next column }
+        if RecsInCol > 0 then
           case Angle of
-            ra0 : begin
+            ra0:
-              if (RenderIn.Top + Anchor.y + WholeRect.Bottom >= RenderIn.Bottom - TextMargin * 3) and
+              if (RenderIn.Top + Anchor.y + WholeRect.Bottom >= RenderIn.Bottom - TextMargin * 3) then
-                 (RecsInCol > 0)
+              begin
-              then begin
                 Anchor := Point(
                   Anchor.x + WholeRect.Right + FContactGrid.BarWidth + 1 + TextMargin * 3,
                   2 + TextMargin * 2
@@ -484,11 +487,9 @@ begin
                 if DisplayOnly and (Anchor.X + TextColWidth >= RenderIn.Right) then
                   Exit;
               end;
-            end;
+            ra90 :
-            ra90 : begin
+              if (Anchor.x + RenderIn.Left + WholeRect.Right - WholeRect.Left > RenderIn.Right - TextMargin * 3) then
-              if (Anchor.x + RenderIn.Left + WholeRect.Right - WholeRect.Left > RenderIn.Right - TextMargin * 3) and
+              begin
-                 (RecsInCol > 0)
-              then begin
                 Anchor.x := 2 + TextMargin * 2;
                 Anchor.y := Anchor.y + WholeRect.Bottom + FContactGrid.BarWidth + 1 + TextMargin * 3;
                 if Col = 1 then
@@ -498,10 +499,8 @@ begin
                 if DisplayOnly and (Anchor.y + TextColWidth >= RenderIn.Bottom) then
                   Exit;
               end;
-            end;
+            ra180 :
-            ra180 : begin
+              if (Anchor.y + RenderIn.Top - WholeRect.Bottom - WholeRect.Top <= RenderIn.Top + TextMargin * 3) then
-              if (Anchor.y + RenderIn.Top - WholeRect.Bottom - WholeRect.Top <= RenderIn.Top + TextMargin * 3) and
-                 (RecsInCol > 0) then
               begin
                 Anchor.x := Anchor.x - (WholeRect.Right + FContactGrid.BarWidth + 1 + TextMargin * 3);
                 Anchor.y := TmpBmp.Height - 2 - TextMargin * 2;
@@ -512,10 +511,8 @@ begin
                 if DisplayOnly and (Anchor.x + TextColWidth < RenderIn.Left) then
                   Exit;
               end;
-            end;
+            ra270 :
-            ra270 : begin
+              if (Anchor.x + RenderIn.Left + (WholeRect.Right - WholeRect.Left) >= RenderIn.Right - TextMargin * 3) then
-              if (Anchor.x + RenderIn.Left + (WholeRect.Right - WholeRect.Left) >= RenderIn.Right - TextMargin * 3) and
-                 (RecsInCol > 0) then
               begin
                 Anchor.x := 2 + TextMargin * 2;
                 Anchor.y := Anchor.y - (WholeRect.Bottom + FContactGrid.BarWidth + 1 + TextMargin * 3);
@@ -526,90 +523,72 @@ begin
                 if DisplayOnly and (Anchor.y + TextColWidth <= RenderIn.Top) then
                   Exit;
               end;
-            end;
-          end;
-
-          { add a little spacing between records }
-          case Angle of
-            ra0   : WholeRect.Bottom := WholeRect.Bottom + TextMargin * 2;
-            ra90  : WholeRect.Left := WholeRect.Left - TextMargin * 2;
-            ra180 : WholeRect.Top := WholeRect.Top - TextMargin * 2;
-            ra270 : WholeRect.Right := WholeRect.Right + TextMargin * 2;
-          end;
-
-          { Update Array Rects }
-          with TVpContactGridOpener(FContactGrid) do begin
-            cgContactArray[I].WholeRect := MoveRect(WholeRect, Anchor);
-            cgContactArray[I].HeaderRect := MoveRect(HeadRect, Anchor);
-            cgContactArray[I].AddressRect := MoveRect(AddrRect, Anchor);
-            cgContactArray[I].CSZRect := MoveRect(CSZRect, Anchor);
-            cgContactArray[I].CompanyRect := MoveRect(CompanyRect, Anchor);
-            cgContactArray[I].EMailRect := MoveRect(EMailRect, Anchor);
-            cgContactArray[I].Phone1Rect := MoveRect(Phone1Rect, Anchor);
-            cgContactArray[I].Phone2Rect := MoveRect(Phone2Rect, Anchor);
-            cgContactArray[I].Phone3Rect := MoveRect(Phone3Rect, Anchor);
-            cgContactArray[I].Phone4Rect := MoveRect(Phone4Rect, Anchor);
-            cgContactArray[I].Phone5Rect := MoveRect(Phone5Rect, Anchor);
-          end;
-
-          { move the drawn record from the bitmap to the component canvas }
-          case Angle of
-            ra0   :
-              RenderCanvas.CopyRect (Rect (Anchor.X + WholeRect.Left + RenderIn.Left,
-                                           Anchor.Y + WholeRect.Top + RenderIn.Top,
-                                           Anchor.X + TmpBmp.Width + RenderIn.Left,
-                                           Anchor.Y + WholeRect.Bottom + RenderIn.Top),
-                                     TmpBmp.Canvas, WholeRect);
-            ra90  :
-              RenderCanvas.CopyRect (Rect (WholeRect.Left + RenderIn.Left - Anchor.X,
-                                           Anchor.Y + WholeRect.Top + RenderIn.Top,
-                                           WholeRect.Right + RenderIn.Left - Anchor.X,
-                                           Anchor.Y + WholeRect.Bottom + RenderIn.Top),
-                                     TmpBmp.Canvas,
-                                     Rect (WholeRect.Left,
-                                           WholeRect.Top,
-                                           WholeRect.Right,
-                                           WholeRect.Bottom));
-
-            ra180 :
-              RenderCanvas.CopyRect (Rect (Anchor.X + WholeRect.Left + RenderIn.Left,
-                                           Anchor.Y - (WholeRect.Bottom - WholeRect.Top) + RenderIn.Top,
-                                           Anchor.X + TmpBmp.Width + RenderIn.Left,
-                                           Anchor.Y + RenderIn.Top),
-                                     TmpBmp.Canvas, WholeRect);
-
-            ra270 :
-              RenderCanvas.CopyRect (Rect (Anchor.X + RenderIn.Left,
-                                           Anchor.Y + RenderIn.Top,
-                                           Anchor.X + RenderIn.Left + (WholeRect.Right - WholeRect.Left),
-                                           Anchor.Y + RenderIn.Top + (WholeRect.Bottom - WholeRect.Top)),
-                                     TmpBmp.Canvas, WholeRect);
-          end;
-
-          { draw focusrect around selected record }
-          if FContactGrid.Focused and (TmpCon = FContactGrid.ActiveContact) then begin
-            with TVpContactGridOpener(FContactGrid).cgContactArray[I] do begin
-              R := WholeRect;
-              InflateRect(R, 3, 3);
-              dec(R.Bottom, 2*3);
-              RenderCanvas.DrawFocusRect(R);
-              {
-              RenderCanvas.DrawFocusRect(Rect(WholeRect.Left, WholeRect.Top - 3,
-                WholeRect.Right + TextMargin, WholeRect.Bottom - 2));
-              }
-            end;
-          end;
-
-          { slide anchor down for the next record }
-          case Angle of
-            ra0   : Anchor.Y := Anchor.Y + WholeRect.Bottom;
-            ra90  : Anchor.X := Anchor.X + (WholeRect.Right - WholeRect.Left);
-            ra180 : Anchor.Y := Anchor.Y - (WholeRect.Bottom - WholeRect.Top);
-            ra270 : Anchor.X := Anchor.X + WholeRect.Right;
-          end;
-          Inc(RecsInCol);
         end;
-      end;
+
+        { add a little spacing between records }
+        case Angle of
+          ra0   : WholeRect.Bottom := WholeRect.Bottom + TextMargin * 2;
+          ra90  : WholeRect.Left := WholeRect.Left - TextMargin * 2;
+          ra180 : WholeRect.Top := WholeRect.Top - TextMargin * 2;
+          ra270 : WholeRect.Right := WholeRect.Right + TextMargin * 2;
+        end;
+
+        { Update Array Rects }
+        with TVpContactGridOpener(FContactGrid) do begin
+          cgContactArray[I].WholeRect := MoveRect(WholeRect, Anchor);
+          cgContactArray[I].HeaderRect := MoveRect(HeadRect, Anchor);
+          cgContactArray[I].AddressRect := MoveRect(AddrRect, Anchor);
+          cgContactArray[I].CSZRect := MoveRect(CSZRect, Anchor);
+          cgContactArray[I].CompanyRect := MoveRect(CompanyRect, Anchor);
+          cgContactArray[I].EMailRect := MoveRect(EMailRect, Anchor);
+          cgContactArray[I].Phone1Rect := MoveRect(Phone1Rect, Anchor);
+          cgContactArray[I].Phone2Rect := MoveRect(Phone2Rect, Anchor);
+          cgContactArray[I].Phone3Rect := MoveRect(Phone3Rect, Anchor);
+          cgContactArray[I].Phone4Rect := MoveRect(Phone4Rect, Anchor);
+          cgContactArray[I].Phone5Rect := MoveRect(Phone5Rect, Anchor);
+        end;
+
+        { move the drawn record from the bitmap to the component canvas }
+        case Angle of
+          ra0   : R := Rect(Anchor.X + WholeRect.Left + RenderIn.Left,
+                            Anchor.Y + WholeRect.Top + RenderIn.Top,
+                            Anchor.X + TmpBmp.Width + RenderIn.Left,
+                            Anchor.Y + WholeRect.Bottom + RenderIn.Top);
+          ra90  : R := Rect(WholeRect.Left + RenderIn.Left - Anchor.X,
+                            Anchor.Y + WholeRect.Top + RenderIn.Top,
+                            WholeRect.Right + RenderIn.Left - Anchor.X,
+                            Anchor.Y + WholeRect.Bottom + RenderIn.Top);
+          ra180 : R := Rect(Anchor.X + WholeRect.Left + RenderIn.Left,
+                            Anchor.Y - (WholeRect.Bottom - WholeRect.Top) + RenderIn.Top,
+                            Anchor.X + TmpBmp.Width + RenderIn.Left,
+                            Anchor.Y + RenderIn.Top);
+          ra270 : R := Rect(Anchor.X + RenderIn.Left,
+                            Anchor.Y + RenderIn.Top,
+                            Anchor.X + RenderIn.Left + (WholeRect.Right - WholeRect.Left),
+                            Anchor.Y + RenderIn.Top + (WholeRect.Bottom - WholeRect.Top));
+        end;
+        RenderCanvas.CopyRect(R, TmpBmp.Canvas, WholeRect);
+
+        { draw focusrect around selected record }
+        if FContactGrid.Focused and (TmpCon = FContactGrid.ActiveContact) then begin
+          with TVpContactGridOpener(FContactGrid).cgContactArray[I] do begin
+            R := WholeRect;
+            InflateRect(R, 3, 0);
+            OffsetRect(R, 0, -3);
+            RenderCanvas.DrawFocusRect(R);
+          end;
+        end;
+
+        { slide anchor down for the next record }
+        case Angle of
+          ra0   : Anchor.Y := Anchor.Y + WholeRect.Bottom;
+          ra90  : Anchor.X := Anchor.X + (WholeRect.Right - WholeRect.Left);
+          ra180 : Anchor.Y := Anchor.Y - (WholeRect.Bottom - WholeRect.Top);
+          ra270 : Anchor.X := Anchor.X + WholeRect.Right;
+        end;
+
+        Inc(RecsInCol);
+      end;  // for I := StartCont to ...
 
       if not DisplayOnly then
         case Angle of
@@ -618,48 +597,48 @@ begin
               if (Anchor.X > RenderIn.Right) and (I < DataStore.Resource.Contacts.Count)
               then begin
                 { we have filled in the visible area }
-                FContactsAfter := DataStore.Resource.Contacts.Count - I;
+                FContactsAfter := contactCount - I;
-                FVisibleContacts := DataStore.Resource.Contacts.Count - StartContact - FContactsAfter;
+                FVisibleContacts := contactCount - StartContact - FContactsAfter;
                 Break;
               end else begin
                 FContactsAfter := 0;
-                FVisibleContacts := DataStore.Resource.Contacts.Count - StartContact;
+                FVisibleContacts := contactCount - StartContact;
               end;
           ra90 :
             with TVpContactGridOpener(FContactGrid) do
-              if (Anchor.Y > RenderIn.Bottom) and (I < DataStore.Resource.Contacts.Count)
+              if (Anchor.Y > RenderIn.Bottom) and (I < contactCount)
               then begin
                 { we have filled in the visible area }
-                FContactsAfter := DataStore.Resource.Contacts.Count - I;
+                FContactsAfter := contactCount - I;
-                FVisibleContacts := DataStore.Resource.Contacts.Count - StartContact - FContactsAfter;
+                FVisibleContacts := contactCount - StartContact - FContactsAfter;
                 Break;
               end else begin
                 FContactsAfter := 0;
-                FVisibleContacts := DataStore.Resource.Contacts.Count - StartContact;
+                FVisibleContacts := contactCount - StartContact;
               end;
           ra180 :
             with TVpContactGridOpener(FContactGrid) do begin
-              if (Anchor.X < RenderIn.Left) and (I < DataStore.Resource.Contacts.Count)
+              if (Anchor.X < RenderIn.Left) and (I < contactCount)
               then begin
                 { we have filled in the visible area }
-                FContactsAfter := DataStore.Resource.Contacts.Count - I;
+                FContactsAfter := contactCount - I;
-                FVisibleContacts := DataStore.Resource.Contacts.Count - StartContact - FContactsAfter;
+                FVisibleContacts := contactCount - StartContact - FContactsAfter;
                 Break;
               end else
                 FContactsAfter := 0;
-              FVisibleContacts := DataStore.Resource.Contacts.Count - StartContact;
+              FVisibleContacts := contactCount - StartContact;
             end;
           ra270 :
             with TVpContactGridOpener(FContactGrid) do begin
-              if (Anchor.Y < RenderIn.Top) and (I < DataStore.Resource.Contacts.Count)
+              if (Anchor.Y < RenderIn.Top) and (I < contactCount)
               then begin
                 { we have filled in the visible area }
-                FContactsAfter := DataStore.Resource.Contacts.Count - I;
+                FContactsAfter := contactCount - I;
-                FVisibleContacts := DataStore.Resource.Contacts.Count - StartContact - FContactsAfter;
+                FVisibleContacts := contactCount - StartContact - FContactsAfter;
                 Break;
               end else
                 FContactsAfter := 0;
-              FVisibleContacts := DataStore.Resource.Contacts.Count - StartContact;
+              FVisibleContacts := contactCount - StartContact;
             end;
         end;
     end;

components/tvplanit/source/vpdata.pas

@@ -2564,7 +2564,7 @@ begin
     Result := FContactsList.IndexOf(Contact);                            
 end;                                                                     
 
-procedure TVpContacts.SetContactSort (const v : TVpContactSort);
+procedure TVpContacts.SetContactSort(const v: TVpContactSort);
 begin
   if v <> FContactSort then begin
     FContactSort := v;