Changeset 662

Timestamp:

Jul 5, 2025, 9:46:37 AM (3 weeks ago)

Author:

chronos

Message:

• Added: Allow to move with up, down, page up, page down, home and end keys in selection dialog.
• Added: Open product selection dialog with P key in city dialog.
• Added: Close city dialog with return key.

Location:

trunk/LocalPlayer

Files:

• CityScreen.pas (modified) (1 diff)
• Select.pas (modified) (12 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -1748 +1748 @@
   Shift: TShiftState);
 begin
+  if Key = VK_P then begin
+    if ProdHint then begin
+      ProdHint := False;
+      SmartUpdateContent;
+    end;
+    ChooseProject;
+  end else
+  if Key = VK_RETURN then begin
+    CloseBtnClick(Self);
+  end else
   if ((Key = VK_UP) or (Key = VK_NUMPAD8)) and (cix >= 0) and
     (WindowMode = wmPersistent) then

trunk/LocalPlayer/Select.pas

@@ -6 +6 @@
 uses
   Protocol, ClientTools, ScreenTools, PVSB, BaseWin, LCLIntf, LCLType, Messages,
-  SysUtils, Classes, ButtonB, ButtonBase, Types,
+  SysUtils, Classes, ButtonB, ButtonBase, Types, Math,
   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, Dpi.Menus,
   Dpi.Common, System.UITypes{$ELSE}
@@ -66 +66 @@
     MultiPage: Boolean;
     ScienceNationDotBuffer: TBitmap;
+    function GetSelectionIndex: Integer;
     procedure ScrollBarUpdate(Sender: TObject);
     procedure InitLines;
-    procedure Line(ca: TCanvas; L: Integer; NonText, lit: Boolean);
+    procedure Line(ca: TCanvas; L: Integer; NonText, Lit: Boolean);
     function RenameModel(mix: Integer): Boolean;
     procedure OnScroll(var Msg: TMessage); message WM_VSCROLL;
     procedure OnMouseLeave(var Msg: TMessage); message CM_MOUSELEAVE;
+    procedure SetSelectionIndex(Index: Integer);
   public
     Result: Integer;
@@ -189 +191 @@
 end;
 
-procedure TListDlg.Line(ca: TCanvas; L: Integer; NonText, lit: Boolean);
+procedure TListDlg.Line(ca: TCanvas; L: Integer; NonText, Lit: Boolean);
 // paint a line
 
@@ -237 +239 @@
 
 var
-  icon, ofs, X, Y, y0, lix, I, J, TextColor, Available, First, Test,
+  Icon, ofs, X, Y, y0, lix, I, J, TextColor, Available, First, Test,
     FutureCount, Growth, TrueFood, TrueProd: Integer;
   CityReport: TCityReportNew;
@@ -261 +263 @@
         Y := Y + TitleHeight;
       end;
-      if lit then
+      if Lit then
         TextColor := MainTexture.ColorLitText
       else
@@ -433 +435 @@
       Y := Y + TitleHeight;
     end;
-    if lit then
+    if Lit then
       TextColor := MainTexture.ColorLitText
     else
@@ -552 +554 @@
 
             if NonText then
-            begin // show tech icon
+            begin // show tech Icon
               if lix = adNexus then
               begin
@@ -604 +606 @@
                 if lix = MyRO.ResearchTech then
                 begin
-                  Server(sGetTechCost, Me, 0, icon);
-                  icon := 4 + MyRO.Research * 4 div icon;
-                  if icon > 4 + 3 then
-                    icon := 4 + 3
+                  Server(sGetTechCost, Me, 0, Icon);
+                  Icon := 4 + MyRO.Research * 4 div Icon;
+                  if Icon > 4 + 3 then
+                    Icon := 4 + 3
                 end
                 else if (lix >= adMilitary) then
-                  icon := -1
+                  Icon := -1
                 else if lix in FutureTech then
                 begin
-                  icon := -1;
+                  Icon := -1;
                   FutureCount := MyRO.Tech[lix];
                 end
                 else if MyRO.Tech[lix] = tsSeen then
-                  icon := 1
+                  Icon := 1
                 else if MyRO.Tech[lix] >= tsApplicable then
-                  icon := 2
+                  Icon := 2
                 else
-                  icon := -1
+                  Icon := -1
               else
                 with MyRO.EnemyReport[Column[J]]^ do // enemy science
@@ -629 +631 @@
                     (Tech[lix] < tsApplicable)) then
                   begin
-                    icon := 4 + ResearchDone div 25;
-                    if icon > 4 + 3 then
-                      icon := 4 + 3;
+                    Icon := 4 + ResearchDone div 25;
+                    if Icon > 4 + 3 then
+                      Icon := 4 + 3;
                   end
                   else if lix = adMilitary then
-                    icon := -1
+                    Icon := -1
                   else if lix in FutureTech then
                   begin
-                    icon := -1;
+                    Icon := -1;
                     FutureCount := Tech[lix]
                   end
                   else if Tech[lix] >= tsApplicable then
-                    icon := 2
+                    Icon := 2
                   else if Tech[lix] = tsSeen then
-                    icon := 1
+                    Icon := 1
                   else
-                    icon := -1;
-              if icon >= 0 then
+                    Icon := -1;
+              if Icon >= 0 then
                 Sprite(Offscreen, HGrSystem, 104 - 33 + 15 + 3 + TechNameSpace +
-                  24 * J, y0 + 3, 14, 14, 67 + icon * 15, 85)
+                  24 * J, y0 + 3, 14, 14, 67 + Icon * 15, 85)
               else if (Kind = kScience) and (FutureCount > 0) then
               begin
@@ -710 +712 @@
       Y := Y + TitleHeight;
     end;
-    if lit then
+    if Lit then
       TextColor := MainTexture.ColorLitText
     else
@@ -788 +790 @@
     (Selected + i0 >= Lines[Layer]) then
     Selected := -2;
-  if Selected <> Sel0 then
-  begin
+  if Selected <> Sel0 then begin
     if Sel0 <> -2 then
       Line(Canvas, Sel0, False, False);
@@ -1861 +1862 @@
 end;
 
+function TListDlg.GetSelectionIndex: Integer;
+begin
+  if Selected >= 0 then Result := ScrollBar.Position + Selected
+    else Result := -1;
+end;
+
+procedure TListDlg.SetSelectionIndex(Index: Integer);
+var
+  NewSelected: Integer;
+  NewScrollBarPos: Integer;
+  Over: Integer;
+  Under: Integer;
+begin
+  if Index < 0 then Index := 0;
+  if Index > Lines[Layer] - 1 then Index := Lines[Layer] - 1;
+
+  NewSelected := Index - ScrollBar.Position;
+  NewScrollBarPos := ScrollBar.Position;
+
+  Over := NewSelected - Min(DispLines, Lines[Layer] - NewScrollBarPos);
+  if Over > 0 then begin
+    Inc(NewScrollBarPos, Over);
+    Dec(NewSelected, Over);
+  end;
+
+  Under := -NewSelected;
+  if Under > 0 then begin
+    Dec(NewScrollBarPos, Under);
+    Inc(NewSelected, Under);
+  end;
+
+  if (NewSelected <> Selected) or (NewScrollBarPos <> ScrollBar.Position) then begin
+    if Selected >= 0 then Line(Canvas, Selected, False, False);
+
+    ScrollBar.Position := NewScrollBarPos;
+    Selected := NewSelected;
+
+    Line(Canvas, Selected, False, True);
+  end;
+end;
+
 procedure TListDlg.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
-begin
+var
+  LastSelectionIndex: Integer;
+begin
+  if (Key = VK_RIGHT) or (Key = VK_NUMPAD6) then begin
+    if MultiPage and (Layer < MaxLayer - 1) then begin
+      LastSelectionIndex := GetSelectionIndex;
+      Inc(Layer);
+      if Lines[Layer] = 0 then Inc(Layer);
+      ScrollBar.Init(Lines[Layer] - 1, DispLines);
+      SetSelectionIndex(LastSelectionIndex);
+      SmartUpdateContent;
+    end;
+  end else
+  if (Key = VK_LEFT) or (Key = VK_NUMPAD4) then begin
+    if MultiPage and (Layer > 0) then begin
+      LastSelectionIndex := GetSelectionIndex;
+      Dec(Layer);
+      if Lines[Layer] = 0 then Dec(Layer);
+      ScrollBar.Init(Lines[Layer] - 1, DispLines);
+      SetSelectionIndex(LastSelectionIndex);
+      SmartUpdateContent;
+    end;
+  end else
+  if (Key = VK_UP) or (Key = VK_NUMPAD8) then begin
+    SetSelectionIndex(GetSelectionIndex - 1);
+  end else
+  if (Key = VK_DOWN) or (Key = VK_NUMPAD2) then begin
+    SetSelectionIndex(GetSelectionIndex + 1);
+  end else
+  if (Key = VK_HOME) or (Key = VK_NUMPAD7) then begin
+    SetSelectionIndex(0);
+  end else
+  if (Key = VK_END) or (Key = VK_NUMPAD1) then begin
+    SetSelectionIndex(Lines[Layer]);
+  end else
+  if (Key = VK_PRIOR) or (Key = VK_NUMPAD9) then begin
+    SetSelectionIndex(GetSelectionIndex - ScrollBar.PageSize);
+  end else
+  if (Key = VK_NEXT) or (Key = VK_NUMPAD3) then begin
+    SetSelectionIndex(GetSelectionIndex + ScrollBar.PageSize);
+  end else
+  if Key = VK_RETURN then begin
+    PaintBox1MouseDown(Self, TMouseButton.mbLeft, [ssLeft], 0, 0);
+  end else
   if (Key = VK_F2) and (Kind in [kModels, kEModels]) then // my key
     // !!! toggle