Changeset 373

Timestamp:

Jan 2, 2025, 11:17:24 PM (4 days ago)

Author:

chronos

Message:

• Fixed: Color background in players list under Qt5.

Location:

trunk

Files:

• Forms/FormMove.lfm (modified) (3 diffs)
• Forms/FormMove.pas (modified) (2 diffs)
• Images/16x16/Save.png (modified) ( previous)
• Packages/Common/Forms/FormList.lfm (modified) (6 diffs)
• Packages/Common/Forms/FormList.pas (modified) (1 diff)

trunk/Forms/FormMove.lfm

@@ -26 +26 @@
     ParentFont = False
     TabOrder = 0
-    OnClick = ButtonOkClick
   end
   object ButtonCancel: TButton
@@ -114 +113 @@
       Height = 58
       Top = 80
-      Width = 275
+      Width = 256
       OnChange = TrackBarOnceChange
       PageSize = 1
@@ -158 +157 @@
     object TrackBarRepeat: TTrackBar
       Left = 96
-      Height = 58
-      Top = 156
-      Width = 269
+      Height = 30
+      Top = 180
+      Width = 256
       OnChange = TrackBarRepeatChange
       PageSize = 1

trunk/Forms/FormMove.pas

@@ -28 +28 @@
     TrackBarOnce: TTrackBar;
     TrackBarRepeat: TTrackBar;
-    procedure ButtonOkClick(Sender: TObject);
     procedure ButtonOnceMaxClick(Sender: TObject);
     procedure ButtonRemoveClick(Sender: TObject);
@@ -109 +108 @@
 end;
 
-procedure TFormMove.ButtonOkClick(Sender: TObject);
-begin
-
-end;
-
 procedure TFormMove.ButtonRemoveClick(Sender: TObject);
 begin

trunk/Packages/Common/Forms/FormList.lfm

@@ -1 +1 @@
 object FormList: TFormList
   Left = 1040
-  Height = 300
+  Height = 360
   Top = 540
-  Width = 400
+  Width = 480
   Caption = 'List'
-  ClientHeight = 300
-  ClientWidth = 400
-  DesignTimePPI = 120
+  ClientHeight = 360
+  ClientWidth = 480
+  DesignTimePPI = 144
   OnCreate = FormCreate
   OnDestroy = FormDestroy
@@ -14 +14 @@
   object ListView1: TListView
     Left = 0
-    Height = 268
+    Height = 322
     Top = 0
-    Width = 400
+    Width = 480
     Align = alClient
     Columns = <    
       item
         Caption = 'Name'
-        Width = 389
+        Width = 467
       end>
     MultiSelect = True
@@ -40 +40 @@
   object ToolBar1: TToolBar
     Left = 0
-    Top = 268
-    Width = 400
+    Height = 38
+    Top = 322
+    Width = 480
     Align = alBottom
     ParentFont = False
@@ -53 +54 @@
     end
     object ToolButton2: TToolButton
-      Left = 30
+      Left = 36
       Top = 2
       Action = AModify
     end
     object ToolButton3: TToolButton
-      Left = 59
+      Left = 71
       Top = 2
       Action = ARemove
     end
     object ToolButton4: TToolButton
-      Left = 88
+      Left = 106
       Top = 2
       Action = AClone
@@ -69 +70 @@
   end
   object ActionList1: TActionList
-    Left = 174
-    Top = 133
+    Left = 209
+    Top = 160
     object AAdd: TAction
       Caption = 'Add'
@@ -101 +102 @@
   end
   object PopupMenu1: TPopupMenu
-    Left = 294
-    Top = 133
+    Left = 353
+    Top = 160
     object MenuItem1: TMenuItem
       Action = AAdd

trunk/Packages/Common/Forms/FormList.pas

@@ -204 +204 @@
   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;