Changeset 104 for trunk

Timestamp:

Jan 25, 2018, 11:03:52 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Do not use ClientWidth and ClientHeight in FormCreate method.
• Fixed: Wrong background drawing of End of Turn button.

Location:

trunk

Files:

• Components/EOTButton.pas (modified) (1 diff)
• Inp.pas (modified) (1 diff)
• LocalPlayer/BaseWin.pas (modified) (1 diff)
• LocalPlayer/Draft.pas (modified) (1 diff)
• LocalPlayer/NatStat.pas (modified) (1 diff)
• Messg.pas (modified) (1 diff)
• Start.pas (modified) (1 diff)

trunk/Components/EOTButton.pas

@@ -123 +123 @@
     if FGraphic <> nil then
     begin
-      BitBlt(Buffer.Canvas.Handle, 0, 0, 48, 48, Back.Canvas.Handle, 0,
-        0, SRCCOPY);
+      // TODO: For some reason BitBlt is not working with gray background here
+      //BitBlt(Buffer.Canvas.Handle, 0, 0, 48, 48, Back.Canvas.Handle, 0,
+      //  0, SRCCOPY);
+      Buffer.Canvas.Draw(0, 0, Back);
       ImageOp_CBC(Buffer, Template, 0, 0, 133, 149 + 48 * Byte(FDown), 48, 48,
         $000000, $FFFFFF);

trunk/Inp.pas

@@ -36 +36 @@
   Canvas.Font.Assign(UniFont[ftNormal]);
   Canvas.Brush.Style := bsClear;
-  TitleHeight := ClientHeight;
+  TitleHeight := Height;
   InitButtons();
   Center := true;

trunk/LocalPlayer/BaseWin.pas

@@ -236 +236 @@
   ModalIndication := true;
   Canvas.Brush.Style := bsClear;
-  InnerWidth := ClientWidth - 2 * SideFrame;
-  InnerHeight := ClientHeight - TitleHeight - NarrowFrame;
+  InnerWidth := Width - 2 * SideFrame;
+  InnerHeight := Height - TitleHeight - NarrowFrame;
 end;
 

trunk/LocalPlayer/Draft.pas

@@ -88 +88 @@
   Back := TBitmap.Create;
   Back.PixelFormat := pf24bit;
-  Back.SetSize(ClientWidth, ClientHeight);
+  Back.SetSize(Width, Height);
   Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
   Template := TBitmap.Create;

trunk/LocalPlayer/NatStat.pas

@@ -89 +89 @@
   Back := TBitmap.Create;
   Back.PixelFormat := pf24bit;
-  Back.SetSize(ClientWidth, ClientHeight);
+  Back.SetSize(Width, Height);
   Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
   Template := TBitmap.Create;

trunk/Messg.pas

@@ -156 +156 @@
 procedure TBaseMessgDlg.FormCreate(Sender: TObject);
 begin
-  Left := (Screen.Width - ClientWidth) div 2;
+  Left := (Screen.Width - Width) div 2;
   Canvas.Font.Assign(UniFont[ftNormal]);
   Canvas.Brush.Style := bsClear;

trunk/Start.pas

@@ -258 +258 @@
     Location := Point(Screen.Width, Screen.Height);
     Location := Point((Screen.width - 800) * 3 div 8,
-      Screen.height - ClientHeight - (Screen.height - 600) div 3);
+      Screen.height - Height - (Screen.height - 600) div 3);
     Left := Location.X;
     Top := Location.Y;
 
-    r0 := CreateRectRgn(0, 0, ClientWidth, ClientHeight);
-    r1 := CreateRectRgn(TabOffset + 4 * TabSize + 2, 0, ClientWidth, TabHeight);
+    r0 := CreateRectRgn(0, 0, Width, Height);
+    r1 := CreateRectRgn(TabOffset + 4 * TabSize + 2, 0, Width, TabHeight);
     CombineRgn(r0, r0, r1, RGN_DIFF);
     // DeleteObject(r1);