Changeset 584 for Common/Forms/FormList.pas

Timestamp:

Jan 17, 2025, 8:00:49 AM (12 days ago)

Author:

chronos

Message:

• Modified: Updated Common package.

File:

• Common/Forms/FormList.pas (modified) (3 diffs)

Common/Forms/FormList.pas

@@ -72 +72 @@
   SRemoveItems = 'Remove items';
   SRemoveItemsQuery = 'Do you want to remove selected items?';
-  SNew = 'New';
 
 { TFormList }
@@ -129 +128 @@
   FormItem := TFormItem.Create(Self);
   try
-    TempEntry.Name := FList.GetNextAvailableName(SNew + ' ' + LowerCase(List.GetName));
+    TempEntry.Name := FList.GetNextAvailableName(List.GetName);
     FormItem.Item := TempEntry;
     if FormItem.ShowModal = mrOk then begin
@@ -204 +203 @@
   ItemFields: TItemFields;
   ItemField: TItemField;
+  DrawRect: TRect;
 begin
   ItemFields := TItem(Item.Data).GetFields;
   try
     ItemField := ItemFields[SubItem];
-    if ItemField.DataType = dtColor then
-    with ListView1.Canvas do begin
+    with ListView1.Canvas do
+    if ItemField.DataType = dtColor then begin
       Brush.Color := TItem(Item.Data).GetValueColor(ItemField.Index);
       Brush.Style := bsSolid;
-      FillRect(Item.DisplayRectSubItem(SubItem, drBounds));
-    end;
+      DrawRect := Item.DisplayRectSubItem(SubItem, drBounds);
+      {$IFDEF LCLQT5}
+      // TODO: Wrong rectangle width on Qt5
+      if DrawRect.Width > ListView1.Columns[SubItem].Width then
+        DrawRect.Width := ListView1.Columns[SubItem].Width;
+      {$ENDIF}
+      FillRect(DrawRect);
+      end;
   finally
     ItemFields.Free;