Changeset 502 for trunk

Timestamp:

Dec 23, 2023, 1:50:31 PM (4 months ago)

Author:

chronos

Message:

• Fixed: Non-DPI build.
• Modified: Code cleanup.

Location:

trunk

Files:

• LocalPlayer/Help.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (2 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (2 diffs)
• Packages/DpiControls/Dpi.StdCtrls.pas (modified) (2 diffs)

trunk/LocalPlayer/Help.pas

@@ -1918 +1918 @@
       LineFeed;
 
-    //Self.Show;
     ScrollBar.Init(Count - 1, InnerHeight div 24);
     ScrollBar.SetPos(sbPos);

trunk/LocalPlayer/Term.pas

@@ -1575 +1575 @@
         TestColorDistance := abs(Integer(UnusedTribeFiles.Objects[J])
           shr 16 and $FF - Tribe[I].Color shr 16 and $FF) +
-          abs(Integer(UnusedTribeFiles.Objects[J]) shr 8 and
+          Abs(Integer(UnusedTribeFiles.Objects[J]) shr 8 and
           $FF - Tribe[I].Color shr 8 and $FF) * 3 +
-          abs(Integer(UnusedTribeFiles.Objects[J]) and
+          Abs(Integer(UnusedTribeFiles.Objects[J]) and
           $FF - Tribe[I].Color and $FF) * 2;
         if TestColorDistance < ColorDistance then
@@ -1721 +1721 @@
   AdvIcon[adConscription] := 86 + dGround;
 
-  UnusedTribeFiles := tstringlist.Create;
+  UnusedTribeFiles := TStringList.Create;
   UnusedTribeFiles.Sorted := True;
   TribeNames := tstringlist.Create;

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -100 +100 @@
 {$IFNDEF DPI}
 function ScaleToNative(Value: Integer): Integer;
+function ScaleToNativeDist(Base, Value: Integer): Integer;
 function ScaleFromNative(Value: Integer): Integer;
 {$ENDIF}
@@ -1652 +1653 @@
 end;
 
+function ScaleToNativeDist(Base, Value: Integer): Integer;
+begin
+  Result := Value;
+end;
+
 function ScaleFromNative(Value: Integer): Integer;
 begin

trunk/Packages/DpiControls/Dpi.StdCtrls.pas

@@ -171 +171 @@
   protected
     function GetNativeControl: Controls.TControl; override;
+    function GetNativeScrollBar: StdCtrls.TScrollBar; virtual;
   public
     NativeScrollBar: StdCtrls.TScrollBar;
@@ -392 +393 @@
 function TScrollBar.GetKind: TScrollBarKind;
 begin
-  Result := NativeScrollBar.Kind;
+  Result := GetNativeScrollBar.Kind;
 end;
 
 function TScrollBar.GetMax: Integer;
 begin
-  Result := NativeScrollBar.Max;
+  Result := GetNativeScrollBar.Max;
 end;
 
 function TScrollBar.GetMin: Integer;
 begin
-  Result := NativeScrollBar.Min;
+  Result := GetNativeScrollBar.Min;
 end;
 
 function TScrollBar.GetOnChange: TNotifyEvent;
 begin
-  Result := NativeScrollBar.OnChange;
+  Result := GetNativeScrollBar.OnChange;
 end;
 
 function TScrollBar.GetPageSize: Integer;
 begin
-  Result := NativeScrollBar.PageSize;
+  Result := GetNativeScrollBar.PageSize;
 end;
 
 function TScrollBar.GetPosition: Integer;
 begin
-  Result := NativeScrollBar.Position;
+  Result := GetNativeScrollBar.Position;
 end;
 
 procedure TScrollBar.SetKind(AValue: TScrollBarKind);
 begin
-  NativeScrollBar.Kind := AValue;
+  GetNativeScrollBar.Kind := AValue;
 end;
 
 procedure TScrollBar.SetMax(AValue: Integer);
 begin
-  NativeScrollBar.Max := AValue;
+  GetNativeScrollBar.Max := AValue;
 end;
 
 procedure TScrollBar.SetMin(AValue: Integer);
 begin
-  NativeScrollBar.Min := Avalue;
+  GetNativeScrollBar.Min := Avalue;
 end;
 
 procedure TScrollBar.SetOnChange(AValue: TNotifyEvent);
 begin
-  NativeScrollBar.OnChange := AValue;
+  GetNativeScrollBar.OnChange := AValue;
 end;
 
 procedure TScrollBar.SetPageSize(AValue: Integer);
 begin
-  NativeScrollBar.PageSize := AValue;
+  GetNativeScrollBar.PageSize := AValue;
 end;
 
 procedure TScrollBar.SetPosition(AValue: Integer);
 begin
-  NativeScrollBar.Position := AValue;
+  GetNativeScrollBar.Position := AValue;
 end;
 
 function TScrollBar.GetNativeControl: Controls.TControl;
+begin
+  Result := GetNativeScrollBar;
+end;
+
+function TScrollBar.GetNativeScrollBar: StdCtrls.TScrollBar;
 begin
   if not Assigned(NativeScrollBar) then NativeScrollBar := StdCtrls.TScrollBar.Create(nil);