Changeset 361 for branches/highdpi/LocalPlayer/MessgEx.pas

Timestamp:

Apr 9, 2021, 5:56:50 PM (3 years ago)

Author:

chronos

Message:

• Modified: Merged changes from trunk r360 into highdpi branch.

File:

• branches/highdpi/LocalPlayer/MessgEx.pas (modified) (9 diffs)

branches/highdpi/LocalPlayer/MessgEx.pas

@@ -10 +10 @@
 
 type
+  TMessageIconKind = (mikNone, mikImp, mikModel, mikTribe, mikBook, mikAge,
+    mikPureIcon, mikMyArmy, mikEnemyArmy, mikFullControl, mikShip, mikBigIcon,
+    mikEnemyShipComplete);
+
   TMessgExDlg = class(TBaseMessgDlg)
     Button1: TButtonA;
@@ -26 +30 @@
     procedure RemoveBtnClick(Sender: TObject);
   public
-    Kind, IconKind, IconIndex, HelpKind, HelpNo, CenterTo: integer;
+    Kind: TMessageKind;
+    IconIndex: Integer;
+    HelpKind: Integer;
+    HelpNo: Integer;
+    CenterTo: Integer;
+    IconKind: TMessageIconKind;
     OpenSound: string;
     function ShowModal: integer; override;
@@ -38 +47 @@
   end;
 
-const
-  // extra message kinds
-  mkYesNoCancel = 4;
-  mkOkCancelRemove = 5;
-  mkOkHelp = 6;
-  mkModel = 7;
-
-  // message icon kinds
-  mikNone = -1;
-  mikImp = 0;
-  mikModel = 1;
-  mikTribe = 2;
-  mikBook = 3;
-  mikAge = 4;
-  mikPureIcon = 5;
-  mikMyArmy = 6;
-  mikEnemyArmy = 7;
-  mikFullControl = 8;
-  mikShip = 9;
-  mikBigIcon = 10;
-  mikEnemyShipComplete = 11;
-
 var
   MessgExDlg: TMessgExDlg;
@@ -65 +52 @@
 procedure SoundMessageEx(SimpleText, SoundItem: string);
 procedure TribeMessage(p: integer; SimpleText, SoundItem: string);
-function SimpleQuery(QueryKind: integer; SimpleText, SoundItem: string)
+function SimpleQuery(QueryKind: TMessageKind; SimpleText, SoundItem: string)
   : integer;
 procedure ContextMessage(SimpleText, SoundItem: string;
@@ -199 +186 @@
 function TMessgExDlg.ShowModal: integer;
 var
-  Ticks0, Ticks: TDateTime;
+  Ticks0: TDateTime;
+  Ticks: TDateTime;
 begin
   if GameMode = cMovie then
@@ -357 +345 @@
   if (IconKind = mikImp) and (IconIndex = 27) then
   begin // "YOU WIN" message
-    clSaveTextLight := MainTexture.clTextLight;
-    clSaveTextShade := MainTexture.clTextShade;
-    MainTexture.clTextLight := $000000; // gold
-    MainTexture.clTextShade := $0FDBFF;
+    clSaveTextLight := MainTexture.ColorTextLight;
+    clSaveTextShade := MainTexture.ColorTextShade;
+    MainTexture.ColorTextLight := $000000; // gold
+    MainTexture.ColorTextShade := $0FDBFF;
     inherited;
-    MainTexture.clTextLight := clSaveTextLight;
-    MainTexture.clTextShade := clSaveTextShade;
+    MainTexture.ColorTextLight := clSaveTextLight;
+    MainTexture.ColorTextShade := clSaveTextShade;
   end
   else
@@ -411 +399 @@
       end;
     mikBook:
-      PaintBook(Canvas, ClientWidth div 2, 24, MainTexture.clPage,
-        MainTexture.clCover);
+      PaintBook(Canvas, ClientWidth div 2, 24, MainTexture.ColorPage,
+        MainTexture.ColorCover);
     mikTribe:
       if Assigned(Tribe[IconIndex].faceHGr) then
@@ -516 +504 @@
 end;
 
-function SimpleQuery(QueryKind: integer; SimpleText, SoundItem: string)
+function SimpleQuery(QueryKind: TMessageKind; SimpleText, SoundItem: string)
   : integer;
 begin
@@ -524 +512 @@
     OpenSound := SoundItem;
     Kind := QueryKind;
-    DpiApplication.ProcessMessages; // TODO: Needed for Gtk2, Lazarus gtk2 bug?
     ShowModal;
     result := ModalResult;