Вывести квадраты в строки

#include <vcl.h>
#pragma hdrstop
 
#include "Unit1.h"
//---------------------------------------------------------------------------
#pragma package(smart_init)
#pragma resource "*.dfm"
TForm1 *Form1;
//---------------------------------------------------------------------------
int n,k;
__fastcall TForm1::TForm1(TComponent* Owner)
    : TForm(Owner)
{
}
//---------------------------------------------------------------------------
void __fastcall TForm1::Timer1Timer(TObject *Sender)
{
  Timer1->Interval = k * 1000;
  int size = 50, shift = 10;
  randomize();
  for (int i = 0; i < n; i++)
  {
    Canvas->Brush->Color = TColor( RGB( random(256), random(256), random(256) ) );
    Canvas->Pen->Color = Canvas->Brush->Color;
    Canvas->Rectangle(shift + i * size, shift, shift + (i + 1) * size, shift + size);
  }
}
//---------------------------------------------------------------------------
void __fastcall TForm1::Button1Click(TObject *Sender)
{
  n=StrToInt(Edit1->Text);
  k=StrToInt(Edit2->Text);
  Timer1->Enabled = 1;
  Timer1->Interval = k;
}

void __fastcall TForm1::Timer1Timer(TObject *Sender)
{
    Timer1->Interval = k * 1000;
    int size = 50, shift = 10;
    int xs = shift, ys = shift;
    randomize();
 
    Canvas->Brush->Color = clBtnFace; // это для очистки формы, без этого картинка будет казаться неправильной
    Canvas->FillRect(Rect(0, 0, Width, Height));
    for (int i = 0; i < n; i++)
    {
        if (xs + size > Width - shift)
        {
            xs = shift;
            ys += size;
        }
        Canvas->Brush->Color = TColor( RGB( random(256), random(256), random(256) ) );
        Canvas->Pen->Color = Canvas->Brush->Color;
        Canvas->Rectangle(xs, ys, xs + size, ys + size);
        xs += size;
    }
}