Changeset 613 for trunk/LocalPlayer/CityScreen.pas

Timestamp:

Sep 14, 2024, 11:02:08 AM (2 months ago)

Author:

chronos

Message:

• Added: Allow to rename city with mouse right click on city caption in City screen.
• Fixed: Do not overflow city name text in City screen.
• Fixed: Repaint main screen after city and unit rename.

File:

• trunk/LocalPlayer/CityScreen.pas (modified) (8 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -144 +144 @@
   hZoomMap = 124;
   wZoomEnvironment = 68;
+  CaptionX = 42;
+  CaptionY = 7;
 
   ImpPosition: array [28 .. nImp - 1] of Integer = (
@@ -408 +410 @@
     begin
       Assert(cix < 0);
-      Exit
+      Exit;
     end;
     Total := TileInfo.Food + TileInfo.Prod + TileInfo.Trade;
@@ -444 +446 @@
   end;
 var
-  Line, MessageCount: Integer;
+  Line: Integer;
+  MessageCount: Integer;
 
   procedure CheckMessage(Flag: Integer);
@@ -472 +475 @@
 
       S := CityEventName(I);
-      { if Flag=chNoGrowthWarning then
-        if C.Built[imAqueduct]=0 then
-        S:=Format(S,[Phrases.Lookup('IMPROVEMENTS',imAqueduct)])
-        else S:=Format(S,[Phrases.Lookup('IMPROVEMENTS',imSewer)]); }
+      { if Flag = chNoGrowthWarning then
+        if C.Built[imAqueduct] = 0 then
+        S := Format(S, [Phrases.Lookup('IMPROVEMENTS', imAqueduct)])
+        else S := Format(S, [Phrases.Lookup('IMPROVEMENTS', imSewer)]); }
       RisedTextOut(Offscreen.Canvas, xmOpt + 40, ymOpt - 1 - 8 * MessageCount +
         16 * Line, S);
@@ -528 +531 @@
   BitBltBitmap(Offscreen, 0, 0, 640, 480, Back, 0, 0);
 
+  // Show city size and name
   Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-  RisedTextOut(Offscreen.Canvas, 42, 7, Caption);
-  with Offscreen.Canvas do
-  begin // city size
+
+  S := Caption;
+  J := Offscreen.Canvas.TextWidth('...');
+  if (Length(S) > 1) and (Offscreen.Canvas.TextWidth(S) > PrevCityBtn.Left - CaptionX) then begin
+    while (Length(S) > 1) and (Offscreen.Canvas.TextWidth(S) > PrevCityBtn.Left - CaptionX - J) do
+      SetLength(S, Length(S) - 1);
+    S := S + '...';
+  end;
+
+  RisedTextOut(Offscreen.Canvas, CaptionX, CaptionY, S);
+  with Offscreen.Canvas do begin // city size
     Brush.Color := $000000;
     FillRect(Rect(8 + 1, 7 + 1, 36 + 1, 32 + 1));
@@ -1161 +1173 @@
     Exit; // Not an own city
 
+  if (ssRight in Shift) then begin
+    // Allow to rename city with right mouse click
+    if (X >= CaptionX) and (Y >= CaptionY) and (X <= PrevCityBtn.Left) and
+    (Y <= NextCityBtn.Top + NextCityBtn.Height) then
+    if Term.MainScreen.ListDlg.RenameCity(cix) then begin
+      SmartUpdateContent;
+      Term.MainScreen.RepaintAll;
+    end;
+  end else
   if (ssLeft in Shift) then
     if (ClientMode < scContact) and (X >= xView) and (Y >= yView) and
@@ -1249 +1270 @@
                     ShowModal;
                     if ModalResult <> mrOK then
-                      iix := -1
+                      iix := -1;
                   end
                   else
@@ -1270 +1291 @@
                     ShowModal;
                     if ModalResult <> mrOK then
-                      iix := -1
+                      iix := -1;
                   end;
                   if iix >= 0 then