Changeset 617 for trunk

Timestamp:

Sep 15, 2024, 1:31:30 PM (3 months ago)

Author:

chronos

Message:

• Fixed: City screen rename right mouse click didn't work on Windows due to window title are. Change to behave the same way as on Linux.
• Fixed: Allow full screen switching in editor and movie mode.
• Modified: Precalculate scaling coefficients also for from native values conversions for faster speed.

Location:

trunk

Files:

• LocalPlayer/CityScreen.pas (modified) (2 diffs)
• LocalPlayer/Term.pas (modified) (2 diffs)
• Packages/CevoComponents/DrawDlg.pas (modified) (5 diffs)
• Packages/DpiControls/Dpi.Common.pas (modified) (2 diffs)
• Packages/DpiControls/Dpi.Graphics.pas (modified) (2 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -1188 +1188 @@
         with MainScreen.MessgExDlg do
         begin
-          { MessgText:=Phrases.Lookup('OUTOFCONTROL');
-            if C.Project and cpImp=0 then
-            MessgText:=Format(MessgText,[Tribe[cOwner].ModelName[C.Project and cpIndex]])
-            else MessgText:=Format(MessgText,[Phrases.Lookup('IMPROVEMENTS',C.Project and cpIndex)]); }
+          { MessgText := Phrases.Lookup('OUTOFCONTROL');
+            if C.Project and cpImp = 0 then
+            MessgText := Format(MessgText, [Tribe[cOwner].ModelName[C.Project and cpIndex]])
+            else MessgText := Format(MessgText, [Phrases.Lookup('IMPROVEMENTS',
+              C.Project and cpIndex)]);
+          }
           MessgText := Phrases.Lookup('NOCHANGEINANARCHY');
           Kind := mkOk;
@@ -1201 +1203 @@
         begin
           ProdHint := False;
-          SmartUpdateContent
+          SmartUpdateContent;
         end;
         ChooseProject;

trunk/LocalPlayer/Term.pas

@@ -7092 +7092 @@
   ShortCut := KeyToShortCut(Key, Shift);
 
+  if BFullScreen.Test(ShortCut) then begin
+    FullScreen := not FullScreen;
+    SetFullScreen(FullScreen);
+  end;
+
   if GameMode = cMovie then begin
     if BScienceStat.Test(ShortCut) then MenuClick_Check(StatPopup, mScienceStat)
@@ -7107 +7112 @@
     else if BFillMap.Test(ShortCut) then mFillMap.Click
     else if BHelp.Test(ShortCut) then mHelp.Click;
-    (*if Shift = [ssCtrl] then
-      case Char(Key) of
-         'A':
-          begin // auto symmetry
-          Server($7F0,Me,0,nil^);
-          MapValid:=False;
-          PaintAll;
-          end;
-          'B':
-          begin // land mass
-          dy:=0;
-          for dx:=G.lx to G.lx*(G.ly-1)-1 do
-          if MyMap[dx] and fTerrain>=fGrass then Inc(dy);
-          dy:=dy
-          end;
-      end;
-    *)
     Exit;
   end;
 
   if BEndTurn.Test(ShortCut) then EndTurn
-  else if BFullScreen.Test(ShortCut) then begin
-    FullScreen := not FullScreen;
-    SetFullScreen(FullScreen);
-  end
   else if BHelp.Test(ShortCut) then mHelp.Click
   else if BUnitStat.Test(ShortCut) then MenuClick_Check(StatPopup, mUnitStat)

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -25 +25 @@
     procedure InitButtons;
     procedure OnEraseBkgnd(var Msg: TMessage); message WM_ERASEBKGND;
-    procedure OnHitTest(var Msg: TMessage); message WM_NCHITTEST;
     procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
       override;
@@ -92 +91 @@
 end;
 
-procedure TDrawDlg.OnHitTest(var Msg: TMessage);
-var
-  I: integer;
-  ControlBounds: TRect;
-  Pos: TPoint;
-begin
-  if BorderStyle <> TBorderStyle.bsNone then
-    inherited
-  else
-  begin
-    Pos := Point(ScaleFromNative(Integer(Msg.LParam and $ffff)),
-      ScaleFromNative(Integer((Msg.LParam shr 16) and $ffff)));
-    if Pos.Y >= Top + TitleHeight then
-      Msg.Result := HTCLIENT
-    else
-    begin
-      for I := 0 to ControlCount - 1 do
-        if Controls[I].Visible then
-        begin
-          ControlBounds := Controls[I].BoundsRect;
-          if (Pos.X >= Left + ControlBounds.Left) and
-            (Pos.X < Left + ControlBounds.Right) and
-            (Pos.Y >= Top + ControlBounds.Top) and
-            (Pos.Y < Top + ControlBounds.Bottom) then
-          begin
-            Msg.result := HTCLIENT;
-            Exit;
-          end;
-        end;
-      Msg.Result := HTCAPTION;
-    end;
-  end;
-end;
-
 procedure TDrawDlg.MouseDown(Button: TMouseButton; Shift: TShiftState; X,
   Y: Integer);
@@ -131 +96 @@
   MousePos1: TPoint;
   MousePos2: TPoint;
-{$IFDEF UNIX}
   NewFormPos: TPoint;
-{$ENDIF}
 begin
   MousePos1 := Mouse.CursorPos;
   inherited;
   MousePos2 := Mouse.CursorPos;
-  {$IFDEF UNIX}
-  // Only if client is not doing own mouse move handling
   if not Assigned(OnMouseDown) or not Assigned(OnMouseMove) or not Assigned(OnMouseUp) then begin
-    // HitTest is not supported under Linux GTK2 so use form inside move mechanizm
     NewFormPos := ScreenToClient(Mouse.CursorPos);
     if (NewFormPos.X >= 0) and (NewFormPos.X < Width) and
@@ -154 +114 @@
     end else MoveActive := False;
   end;
-  {$ENDIF}
 end;
 
@@ -163 +122 @@
   inherited;
   if MoveActive then begin
-    MousePos := ClientToScreen(Point(X, Y));
+    MousePos := Mouse.CursorPos;
     SetBounds(MoveFormPos.X + MousePos.X - MoveMousePos.X,
-      MoveFormPos.Y + MousePos.Y - MoveMousePos.Y,
-      Width, Height);
+      MoveFormPos.Y + MousePos.Y - MoveMousePos.Y, Width, Height);
   end;
 end;

trunk/Packages/DpiControls/Dpi.Common.pas

@@ -225 +225 @@
 function ScaleToNative(Value: Integer): Integer; inline;
 begin
-  Result := ScreenInfo.Lookup[Value];
+  Result := ScreenInfo.LookupToNative[Value];
   // Round and Trunc are fast. Ceil and Floor are slow.
   // Without lookup table we would use:
@@ -238 +238 @@
 function ScaleFromNative(Value: Integer): Integer;
 begin
-  Result := Trunc(Value * ScreenInfo.FromNative);
+  Result := ScreenInfo.LookupFromNative[Value];
+  // Round and Trunc are fast. Ceil and Floor are slow.
+  // Without lookup table we would use:
+  // Result := Floor(Value * ScreenInfo.FromNative);
 end;
 

trunk/Packages/DpiControls/Dpi.Graphics.pas

@@ -354 +354 @@
     ToNative: Double;
     FromNative: Double;
-    Lookup: array[-10000..10000] of Integer; // Should be sufficient for 8K screens
+    LookupToNative: array[-10000..10000] of Integer; // Should be sufficient for 8K screens
+    LookupFromNative: array[-10000..10000] of Integer; // Should be sufficient for 8K screens
     property Dpi: Integer read FDpi write SetDpi;
   end;
@@ -1353 +1354 @@
   if FDpi = AValue then Exit;
   FDpi := AValue;
+
+  // Precalculate scaling coefficients
   ToNative := ScreenInfo.Dpi / 96;
-
-  // Precalculate scaling coefficients
+  for I := Low(LookupToNative) to High(LookupToNative) do
+    LookupToNative[I] := Ceil(I * ToNative);
   FromNative := 96 / ScreenInfo.Dpi;
-  for I := Low(Lookup) to High(Lookup) do
-    Lookup[I] := Ceil(I * ToNative);
+  for I := Low(LookupFromNative) to High(LookupFromNative) do
+    LookupFromNative[I] := Floor(I * FromNative);
 end;