Changeset 435 for trunk/LocalPlayer/Select.pas

Timestamp:

May 4, 2022, 4:59:24 PM (2 years ago)

Author:

chronos

Message:

• Fixed: Possible exception during cities or units rename with right mouse click.
• Fixed: Gtk2Fix added to more places.
• Modified: Code cleanup;

File:

• trunk/LocalPlayer/Select.pas (modified) (21 diffs)

trunk/LocalPlayer/Select.pas

@@ -27 +27 @@
     ToggleBtn: TButtonB;
     Popup: TPopupMenu;
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormMouseWheel(Sender: TObject; Shift: TShiftState;
       WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
@@ -291 +292 @@
           begin
             first := j;
-            Break
+            Break;
           end;
         if first >= 0 then
@@ -300 +301 @@
           begin
             inc(i);
-            inc(test, test)
+            inc(test, test);
           end;
           s := CityEventName(i);
@@ -321 +322 @@
                 begin
                   inc(i);
-                  inc(test, test)
+                  inc(test, test);
                 end;
                 if (CityEventPriority[j] = chNoGrowthWarning) and
@@ -328 +329 @@
                 Sprite(offscreen, HGrSystem, x, y0 + 1, 18, 18,
                   1 + i mod 3 * 19, 1 + i div 3 * 19);
-                dec(x, 20)
-              end
-          end
-        end
+                dec(x, 20);
+              end;
+          end;
+        end;
       end
       else
@@ -366 +367 @@
               y0 + 1, s);
             ca.Font.Assign(UniFont[ftNormal]);
-          end
+          end;
         end
         else
@@ -385 +386 @@
             Sprite(offscreen, HGrSystem, x + CityNameSpace + 4 + 132 + 1, y + 6,
               10, 10, 88, 115);
-          end
+          end;
         end;
         s := inttostr(CityTaxBalance(lix, CityReport));
@@ -421 +422 @@
               CityReport.ProjectCost, true, MainTexture);
           end;
-        end
+        end;
       end;
     end
@@ -431 +432 @@
     begin
       x := x + SideFrame;
-      y := y + TitleHeight
+      y := y + TitleHeight;
     end;
     if lit then
@@ -631 +632 @@
                     icon := 4 + ResearchDone div 25;
                     if icon > 4 + 3 then
-                      icon := 4 + 3
+                      icon := 4 + 3;
                   end
                   else if lix = adMilitary then
@@ -654 +655 @@
                 RisedTextout(ca, 104 - 33 + 15 + 10 + TechNameSpace + 24 * j -
                   BiColorTextWidth(ca, number) div 2, y0, number);
-              end
-            end
+              end;
+            end;
           end;
         end; // kAdvance, kScience
@@ -685 +686 @@
               xSizeSmall, ySizeSmall, SmallImp.Canvas,
               (lix - 1) * xSizeSmall, ySizeSmall);
-          end
+          end;
         end;
       kMission:
@@ -709 +710 @@
     begin
       x := x + SideFrame;
-      y := y + TitleHeight
+      y := y + TitleHeight;
     end;
     if lit then
@@ -718 +719 @@
       integer(TribeNames.Objects[lix]),s)
       else } ReplaceText(x, y, TextColor, s);
-  end
+  end;
 end;
 
@@ -760 +761 @@
             MoveTo(104 - 33 + 15 + TechNameSpace + 24 * i + j * 2, 0);
             LineTo(104 - 33 + 15 + TechNameSpace + 24 * i + j * 2, InnerHeight);
-          end
+          end;
         end;
       end;
@@ -766 +767 @@
     for i := -1 to DispLines do
       if (i + sb.Position >= 0) and (i + sb.Position < Lines[Layer]) then
-        Self.line(offscreen.Canvas, i, true, false)
+        Self.line(offscreen.Canvas, i, true, false);
   end;
   MarkUsedOffscreen(InnerWidth, 8 + 48 + DispLines * LineDistance);
@@ -794 +795 @@
       line(Canvas, Sel0, false, false);
     if Sel <> -2 then
-      line(Canvas, Sel, false, true)
+      line(Canvas, Sel, false, true);
   end;
 
@@ -846 +847 @@
 end;
 
+procedure TListDlg.FormClose(Sender: TObject; var CloseAction: TCloseAction);
+begin
+  Gtk2Fix;
+end;
+
 function TListDlg.RenameCity(cix: integer): boolean;
 var
@@ -859 +865 @@
     CityNameInfo.ID := MyCity[cix].ID;
     CityNameInfo.NewName := InputDlg.EInput.Text;
-    Server(cSetCityName + (length(CityNameInfo.NewName) + 8) div 4, me, 0,
-      CityNameInfo);
+    Server(cSetCityName, me, 0, CityNameInfo);
     if CityDlg.Visible then
     begin
@@ -885 +890 @@
     ModelNameInfo.mix := mix;
     ModelNameInfo.NewName := InputDlg.EInput.Text;
-    Server(cSetModelName + (length(ModelNameInfo.NewName) + 1 + 4 + 3) div 4,
-      me, 0, ModelNameInfo);
+    Server(cSetModelName, me, 0, ModelNameInfo);
     if UnitStatDlg.Visible then
     begin
@@ -1736 +1740 @@
 
   inherited ShowNewContent(NewMode, forceclose);
-end; // ShowNewContent
+end;
 
 procedure TListDlg.ShowNewContent_CityProject(NewMode: TWindowMode; cix: integer);