Changeset 464 for trunk

Timestamp:

Nov 29, 2023, 6:25:22 PM (5 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk

Files:

• Direct.pas (modified) (2 diffs)
• LocalPlayer/CityScreen.pas (modified) (3 diffs)
• LocalPlayer/Tribes.pas (modified) (2 diffs)
• Packages/CevoComponents/BaseWin.pas (modified) (3 diffs)
• Packages/CevoComponents/ButtonBase.pas (modified) (3 diffs)
• Packages/CevoComponents/GraphicSet.pas (modified) (2 diffs)

trunk/Direct.pas

@@ -39 +39 @@
 var
   DirectDlg: TDirectDlg;
+
 
 implementation
@@ -153 +154 @@
         State := -1;
         Show;
-        {$IFDEF UNIX}
-        // Force shown window repaint on Gtk2 widgetset
-        Sleep(1);
-        Application.ProcessMessages;
-        {$ENDIF}
+        Gtk2Fix;
         Invalidate;
         Update;

trunk/LocalPlayer/CityScreen.pas

@@ -403 +403 @@
     D, I, Total, xGr, yGr: Integer;
     TileInfo: TTileInfo;
-    rare: Boolean;
+    Rare: Boolean;
   begin
     with AreaMap do begin
@@ -412 +412 @@
     end;
     Total := TileInfo.Food + TileInfo.Prod + TileInfo.Trade;
-    rare := MyMap[Loc] and $06000000 > 0;
-    if rare then
+    Rare := MyMap[Loc] and $06000000 > 0;
+    if Rare then
       Inc(Total);
     if Add4Happy then
@@ -431 +431 @@
         yGr := 126
       end
-      else if rare and (I = Total - 1) then
+      else if Rare and (I = Total - 1) then
         xGr := 66 + 110
       else if I >= TileInfo.Food + TileInfo.Prod then

trunk/LocalPlayer/Tribes.pas

@@ -509 +509 @@
         HGr := LoadGraphicSet(GrName);
         pix := Info.pix;
-        Inc(HGr.pixUsed[pix]);
+        Inc(HGr.PixUsed[pix]);
       end;
       ModelName[mix] := '';
@@ -584 +584 @@
       else
       begin
-        Used := 4 * HGr.pixUsed[TestPic.pix];
+        Used := 4 * HGr.PixUsed[TestPic.pix];
         if HGr = HGrStdUnits then
           Inc(Used, 2); // prefer units not from StdUnits

trunk/Packages/CevoComponents/BaseWin.pas

@@ -35 +35 @@
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormDeactivate(Sender: TObject);
-    procedure SmartUpdateContent(ImmUpdate: Boolean = False);
-    procedure StayOnTop_Workaround;
+    procedure SmartUpdateContent(ImmediateUpdate: Boolean = False);
     property WindowMode: TWindowMode read FWindowMode;
   end;
@@ -214 +213 @@
 end;
 
-procedure TBufferedDrawDlg.SmartUpdateContent(ImmUpdate: Boolean);
+procedure TBufferedDrawDlg.SmartUpdateContent(ImmediateUpdate: Boolean);
 begin
   if Visible then begin
     OffscreenPaint;
     SmartInvalidate;
-    if ImmUpdate then
+    if ImmediateUpdate then
       Update;
   end;
@@ -230 +229 @@
   if yMax > UsedOffscreenHeight then
     UsedOffscreenHeight := yMax;
-end;
-
-procedure TBufferedDrawDlg.StayOnTop_Workaround;
-// stayontop doesn't work when window is shown for the first time
-// after application lost focus, so show all stayontop-windows in first turn
-var
-  SaveOnShow, SaveOnPaint: TNotifyEvent;
-begin
-  Top := Screen.Height;
-  SaveOnShow := OnShow;
-  OnShow := nil;
-  SaveOnPaint := OnPaint;
-  OnPaint := nil;
-  FWindowMode := wmNone;
-  Show;
-  Hide;
-  OnShow := SaveOnShow;
-  OnPaint := SaveOnPaint;
 end;
 

trunk/Packages/CevoComponents/ButtonBase.pas

@@ -7 +7 @@
 
 type
+
+  { TButtonBase }
+
   TButtonBase = class(TGraphicControl)
   protected
@@ -25 +28 @@
   private
     Active: Boolean;
+    procedure SetGraphic(AValue: TBitmap);
   public
     constructor Create(aOwner: TComponent); override;
-    property Graphic: TBitmap read FGraphic write FGraphic;
+    property Graphic: TBitmap read FGraphic write SetGraphic;
     // property DownSound: string read FDownSound write FDownSound;
     // property UpSound: string read FUpSound write FUpSound;
@@ -120 +124 @@
 end;
 
+procedure TButtonBase.SetGraphic(AValue: TBitmap);
+begin
+  if FGraphic = AValue then Exit;
+  FGraphic := AValue;
+end;
+
 procedure TButtonBase.SetDown(X: Boolean);
 begin

trunk/Packages/CevoComponents/GraphicSet.pas

@@ -45 +45 @@
     Data: TBitmap;
     Mask: TBitmap;
-    pixUsed: array of Byte;
+    PixUsed: array of Byte;
     Items: TGraphicSetItems;
     procedure ResetPixUsed;
@@ -169 +169 @@
 procedure TGraphicSet.ResetPixUsed;
 begin
-  SetLength(pixUsed, Data.Height div 49 * 10);
-  if Length(pixUsed) > 0 then
-    FillChar(pixUsed[0], Length(pixUsed), 0);
+  SetLength(PixUsed, Data.Height div 49 * 10);
+  if Length(PixUsed) > 0 then
+    FillChar(PixUsed[0], Length(PixUsed), 0);
 end;