Changeset 244 for branches

Timestamp:

May 21, 2020, 6:42:45 PM (5 years ago)

Author:

chronos

Message:

• Added: TDpiPopupMenu and TDpiMenuItem support.

Location:

branches/highdpi

Files:

• LocalPlayer/Diagram.lfm (modified) (1 diff)
• LocalPlayer/Diagram.pas (modified) (3 diffs)
• LocalPlayer/Enhance.lfm (modified) ( previous)
• LocalPlayer/Enhance.pas (modified) (4 diffs)
• LocalPlayer/NatStat.lfm (modified) (1 diff)
• LocalPlayer/NatStat.pas (modified) (5 diffs)
• LocalPlayer/Select.lfm (modified) (1 diff)
• LocalPlayer/Select.pas (modified) (4 diffs)
• LocalPlayer/Term.lfm (modified) (11 diffs)
• LocalPlayer/Term.pas (modified) (20 diffs)
• Log.lfm (modified) (5 diffs)
• Log.pas (modified) (3 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (2 diffs)
• Packages/DpiControls/UDpiControls.pas (modified) (7 diffs)
• Start.lfm (modified) (1 diff)
• Start.pas (modified) (7 diffs)

branches/highdpi/LocalPlayer/Diagram.lfm

@@ -38 +38 @@
     ButtonIndex = 15
   end
-  object Popup: TPopupMenu
+  object Popup: TDpiPopupMenu
     Left = 16
     Top = 48

branches/highdpi/LocalPlayer/Diagram.pas

@@ -12 +12 @@
     CloseBtn: TButtonB;
     ToggleBtn: TButtonB;
-    Popup: TPopupMenu;
+    Popup: TDpiPopupMenu;
     procedure CloseBtnClick(Sender: TObject);
     procedure FormPaint(Sender: TObject);
@@ -330 +330 @@
 var
   p1: integer;
-  m: TMenuItem;
+  m: TDpiMenuItem;
 begin
   if Kind = dkChart then
@@ -345 +345 @@
         MyRO.Ship[p1].Parts[spHab] > 0 then
       begin
-        m := TMenuItem.Create(Popup);
+        m := TDpiMenuItem.Create(Popup);
         m.RadioItem := true;
         m.Caption := Tribe[p1].TPhrase('SHORTNAME');

branches/highdpi/LocalPlayer/Enhance.pas

@@ -15 +15 @@
 
   TEnhanceDlg = class(TFramedDlg)
-    MenuItem1: TMenuItem;
+    MenuItem1: TDpiMenuItem;
     ToggleBtn: TButtonB;
     CloseBtn: TButtonB;
@@ -26 +26 @@
     job6: TButtonC;
     job9: TButtonC;
-    Popup: TPopupMenu;
+    Popup: TDpiPopupMenu;
     procedure FormCreate(Sender: TObject);
     procedure FormPaint(Sender: TObject);
@@ -54 +54 @@
 var
   TerrType: integer;
-  m: TMenuItem;
+  m: TDpiMenuItem;
 begin
   inherited;
@@ -67 +67 @@
     if TerrType <> fJungle then
     begin
-      m := TMenuItem.Create(Popup);
+      m := TDpiMenuItem.Create(Popup);
       m.RadioItem := true;
       if TerrType = fGrass then

branches/highdpi/LocalPlayer/NatStat.lfm

@@ -77 +77 @@
     ButtonIndex = 0
   end
-  object Popup: TPopupMenu
+  object Popup: TDpiPopupMenu
     Left = 16
     Top = 48

branches/highdpi/LocalPlayer/NatStat.pas

@@ -16 +16 @@
     ToggleBtn: TButtonB;
     CloseBtn: TButtonB;
-    Popup: TPopupMenu;
+    Popup: TDpiPopupMenu;
     ScrollUpBtn: TButtonC;
     ScrollDownBtn: TButtonC;
@@ -435 +435 @@
 var
   p1, StartCount: integer;
-  m: TMenuItem;
+  m: TDpiMenuItem;
   ExtinctPart: boolean;
 begin
@@ -443 +443 @@
   if G.Difficulty[me] <> 0 then
   begin
-    m := TMenuItem.Create(Popup);
+    m := TDpiMenuItem.Create(Popup);
     m.RadioItem := true;
     m.Caption := Tribe[me].TPhrase('TITLE_NATION');
@@ -462 +462 @@
         (1 shl p1 and MyRO.Alive <> 0) and (MyRO.Treaty[p1] >= trNone) then
       begin
-        m := TMenuItem.Create(Popup);
+        m := TDpiMenuItem.Create(Popup);
         m.RadioItem := true;
         m.Caption := Tribe[p1].TPhrase('TITLE_NATION');
@@ -475 +475 @@
     if (StartCount > 0) and (Popup.Items.Count > StartCount) then
     begin // seperator
-      m := TMenuItem.Create(Popup);
+      m := TDpiMenuItem.Create(Popup);
       m.Caption := '-';
       Popup.Items.Insert(StartCount, m);

branches/highdpi/LocalPlayer/Select.lfm

@@ -75 +75 @@
     ButtonIndex = 15
   end
-  object Popup: TPopupMenu
+  object Popup: TDpiPopupMenu
     Left = 16
     Top = 48

branches/highdpi/LocalPlayer/Select.pas

@@ -27 +27 @@
     Layer0Btn: TButtonB;
     ToggleBtn: TButtonB;
-    Popup: TPopupMenu;
+    Popup: TDpiPopupMenu;
     procedure FormMouseWheel(Sender: TObject; Shift: TShiftState;
       WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
@@ -1773 +1773 @@
 var
   p1: integer;
-  m: TMenuItem;
+  m: TDpiMenuItem;
 begin
   case Kind of
@@ -1796 +1796 @@
         if G.Difficulty[me] > 0 then
         begin
-          m := TMenuItem.Create(Popup);
+          m := TDpiMenuItem.Create(Popup);
           m.RadioItem := true;
           m.Caption := Tribe[me].TPhrase('SHORTNAME');
@@ -1809 +1809 @@
             (MyRO.EnemyReport[p1].TurnOfMilReport >= 0) then
           begin
-            m := TMenuItem.Create(Popup);
+            m := TDpiMenuItem.Create(Popup);
             m.RadioItem := true;
             m.Caption := Tribe[p1].TPhrase('SHORTNAME');

branches/highdpi/LocalPlayer/Term.lfm

@@ -219 +219 @@
     top = 60
   end
-  object GamePopup: TPopupMenu
+  object GamePopup: TDpiPopupMenu
     AutoPopup = False
     left = 50
     top = 60
-    object mHelp: TMenuItem
+    object mHelp: TDpiMenuItem
       Tag = 7
       ShortCut = 112
       OnClick = MenuClick
     end
-    object mTechTree: TMenuItem
+    object mTechTree: TDpiMenuItem
       GroupIndex = 1
       ShortCut = 84
       OnClick = MenuClick
     end
-    object N12: TMenuItem
+    object N12: TDpiMenuItem
       Caption = '-'
       GroupIndex = 1
     end
-    object mViewpoint: TMenuItem
-      GroupIndex = 1
-    end
-    object mDebugMap: TMenuItem
+    object mViewpoint: TDpiMenuItem
+      GroupIndex = 1
+    end
+    object mDebugMap: TDpiMenuItem
       Tag = 49
       GroupIndex = 1
       ShortCut = 16459
     end
-    object mOptions: TMenuItem
+    object mOptions: TDpiMenuItem
       Tag = 29
       GroupIndex = 1
-      object mOwnMovement: TMenuItem
+      object mOwnMovement: TDpiMenuItem
         Tag = 30
         GroupIndex = 1
         RadioItem = True
-        object mSlowMoves: TMenuItem
+        object mSlowMoves: TDpiMenuItem
           Tag = 75
           RadioItem = True
           OnClick = Radio
         end
-        object mFastMoves: TMenuItem
+        object mFastMoves: TDpiMenuItem
           Tag = 76
           RadioItem = True
           OnClick = Radio
         end
-        object mVeryFastMoves: TMenuItem
+        object mVeryFastMoves: TDpiMenuItem
           Tag = 77
           RadioItem = True
           OnClick = Radio
         end
-        object N7: TMenuItem
+        object N7: TDpiMenuItem
           Caption = '-'
         end
-        object mEffectiveMovesOnly: TMenuItem
+        object mEffectiveMovesOnly: TDpiMenuItem
           Tag = 95
           OnClick = Toggle
         end
       end
-      object mAllyMovement: TMenuItem
+      object mAllyMovement: TDpiMenuItem
         Tag = 90
         GroupIndex = 1
         RadioItem = True
-        object mAlSlowMoves: TMenuItem
+        object mAlSlowMoves: TDpiMenuItem
           Tag = 91
           RadioItem = True
           OnClick = Radio
         end
-        object mAlFastMoves: TMenuItem
+        object mAlFastMoves: TDpiMenuItem
           Tag = 92
           RadioItem = True
           OnClick = Radio
         end
-        object mAlNoMoves: TMenuItem
+        object mAlNoMoves: TDpiMenuItem
           Tag = 93
           RadioItem = True
           OnClick = Radio
         end
-        object N8: TMenuItem
+        object N8: TDpiMenuItem
           Caption = '-'
         end
-        object mAlEffectiveMovesOnly: TMenuItem
+        object mAlEffectiveMovesOnly: TDpiMenuItem
           Tag = 94
           OnClick = Toggle
         end
       end
-      object mEnemyMovement: TMenuItem
+      object mEnemyMovement: TDpiMenuItem
         Tag = 74
         GroupIndex = 1
         RadioItem = True
-        object mEnMoves: TMenuItem
+        object mEnMoves: TDpiMenuItem
           Tag = 78
           RadioItem = True
           OnClick = Radio
         end
-        object mEnFastMoves: TMenuItem
+        object mEnFastMoves: TDpiMenuItem
           Tag = 79
           RadioItem = True
           OnClick = Radio
         end
-        object mEnNoMoves: TMenuItem
+        object mEnNoMoves: TDpiMenuItem
           Tag = 53
           RadioItem = True
           OnClick = Radio
         end
-        object N9: TMenuItem
+        object N9: TDpiMenuItem
           Caption = '-'
         end
-        object mEnAttacks: TMenuItem
+        object mEnAttacks: TDpiMenuItem
           Tag = 52
           OnClick = Toggle
         end
       end
-      object N11: TMenuItem
+      object N11: TDpiMenuItem
         Caption = '-'
         GroupIndex = 1
         RadioItem = True
       end
-      object mRepList: TMenuItem
+      object mRepList: TDpiMenuItem
         Tag = 65
         GroupIndex = 1
@@ -340 +340 @@
         OnClick = Radio
       end
-      object mRepScreens: TMenuItem
+      object mRepScreens: TDpiMenuItem
         Tag = 66
         GroupIndex = 1
@@ -346 +346 @@
         OnClick = Radio
       end
-      object mRep: TMenuItem
+      object mRep: TDpiMenuItem
         Tag = 34
         GroupIndex = 1
-        object mRep0: TMenuItem
-          OnClick = mRepClicked
-        end
-        object mRep1: TMenuItem
+        object mRep0: TDpiMenuItem
+          OnClick = mRepClicked
+        end
+        object mRep1: TDpiMenuItem
           Tag = 256
           OnClick = mRepClicked
         end
-        object mRep2: TMenuItem
+        object mRep2: TDpiMenuItem
           Tag = 512
           OnClick = mRepClicked
         end
-        object mRep3: TMenuItem
+        object mRep3: TDpiMenuItem
           Tag = 768
           OnClick = mRepClicked
         end
-        object mRep4: TMenuItem
+        object mRep4: TDpiMenuItem
           Tag = 1024
           OnClick = mRepClicked
         end
-        object mRep5: TMenuItem
+        object mRep5: TDpiMenuItem
           Tag = 1280
           OnClick = mRepClicked
         end
-        object mRep6: TMenuItem
+        object mRep6: TDpiMenuItem
           Tag = 1536
           OnClick = mRepClicked
         end
-        object mRep7: TMenuItem
+        object mRep7: TDpiMenuItem
           Tag = 1792
           OnClick = mRepClicked
         end
-        object mRep8: TMenuItem
+        object mRep8: TDpiMenuItem
           Tag = 2048
           OnClick = mRepClicked
         end
-        object mRep9: TMenuItem
+        object mRep9: TDpiMenuItem
           Tag = 2304
           OnClick = mRepClicked
         end
-        object mRep10: TMenuItem
+        object mRep10: TDpiMenuItem
           Tag = 2560
           OnClick = mRepClicked
         end
-        object mRep11: TMenuItem
+        object mRep11: TDpiMenuItem
           Tag = 2816
           OnClick = mRepClicked
         end
-        object mRep12: TMenuItem
+        object mRep12: TDpiMenuItem
           Tag = 3072
           OnClick = mRepClicked
         end
-        object mRep13: TMenuItem
+        object mRep13: TDpiMenuItem
           Tag = 3328
           OnClick = mRepClicked
         end
-        object mRep14: TMenuItem
+        object mRep14: TDpiMenuItem
           Tag = 3584
           OnClick = mRepClicked
         end
-        object mRep15: TMenuItem
+        object mRep15: TDpiMenuItem
           Tag = 3840
           OnClick = mRepClicked
         end
       end
-      object N10: TMenuItem
+      object N10: TDpiMenuItem
         Caption = '-'
         GroupIndex = 1
       end
-      object mWaitTurn: TMenuItem
+      object mWaitTurn: TDpiMenuItem
         Tag = 32
         GroupIndex = 1
         OnClick = Toggle
       end
-      object mScrolling: TMenuItem
+      object mScrolling: TDpiMenuItem
         Tag = 84
         GroupIndex = 1
-        object mScrollSlow: TMenuItem
+        object mScrollSlow: TDpiMenuItem
           Tag = 85
           RadioItem = True
           OnClick = Radio
         end
-        object mScrollFast: TMenuItem
+        object mScrollFast: TDpiMenuItem
           Tag = 86
           RadioItem = True
           OnClick = Radio
         end
-        object mScrollOff: TMenuItem
+        object mScrollOff: TDpiMenuItem
           Tag = 87
           RadioItem = True
@@ -441 +441 @@
         end
       end
-      object mTileSize: TMenuItem
+      object mTileSize: TDpiMenuItem
         Tag = 96
         GroupIndex = 1
-        object mSmallTiles: TMenuItem
+        object mSmallTiles: TDpiMenuItem
           Caption = '40px'
           RadioItem = True
           OnClick = mSmallTilesClick
         end
-        object mNormalTiles: TMenuItem
+        object mNormalTiles: TDpiMenuItem
           Caption = '60px'
           RadioItem = True
           OnClick = mNormalTilesClick
         end
-        object mBigTiles: TMenuItem
+        object mBigTiles: TDpiMenuItem
           Caption = '90px'
           RadioItem = True
@@ -460 +460 @@
         end
       end
-      object mSound: TMenuItem
+      object mSound: TDpiMenuItem
         Tag = 80
         GroupIndex = 1
-        object mSoundOn: TMenuItem
+        object mSoundOn: TDpiMenuItem
           Tag = 82
           RadioItem = True
           OnClick = mSoundOnClick
         end
-        object mSoundOnAlt: TMenuItem
+        object mSoundOnAlt: TDpiMenuItem
           Tag = 83
           RadioItem = True
@@ -474 +474 @@
           OnClick = mSoundOnAltClick
         end
-        object mSoundOff: TMenuItem
+        object mSoundOff: TDpiMenuItem
           Tag = 81
           RadioItem = True
@@ -480 +480 @@
         end
       end
-      object N6: TMenuItem
+      object N6: TDpiMenuItem
         Caption = '-'
         GroupIndex = 1
       end
-      object mTest: TMenuItem
+      object mTest: TDpiMenuItem
         Tag = 8
         GroupIndex = 1
-        object mJump: TMenuItem
+        object mJump: TDpiMenuItem
           Tag = 54
           ShortCut = 16458
           OnClick = MenuClick
         end
-        object mRun: TMenuItem
+        object mRun: TDpiMenuItem
           Tag = 63
           ShortCut = 16466
           OnClick = MenuClick
         end
-        object mNames: TMenuItem
+        object mNames: TDpiMenuItem
           Tag = 67
           ShortCut = 16462
           OnClick = mNamesClick
         end
-        object mLocCodes: TMenuItem
+        object mLocCodes: TDpiMenuItem
           Tag = 27
           ShortCut = 16460
           OnClick = mShowClick
         end
-        object mLog: TMenuItem
+        object mLog: TDpiMenuItem
           Tag = 10
           ShortCut = 16461
@@ -514 +514 @@
       end
     end
-    object mManip: TMenuItem
+    object mManip: TDpiMenuItem
       Tag = 56
       GroupIndex = 1
-      object mManip0: TMenuItem
+      object mManip0: TDpiMenuItem
         Tag = 57
         OnClick = mManipClick
       end
-      object mManip1: TMenuItem
+      object mManip1: TDpiMenuItem
         Tag = 314
         OnClick = mManipClick
       end
-      object mManip2: TMenuItem
+      object mManip2: TDpiMenuItem
         Tag = 571
         OnClick = mManipClick
       end
-      object mManip3: TMenuItem
+      object mManip3: TDpiMenuItem
         Tag = 828
         OnClick = mManipClick
       end
-      object mManip4: TMenuItem
+      object mManip4: TDpiMenuItem
         Tag = 1085
         OnClick = mManipClick
       end
-      object mManip5: TMenuItem
+      object mManip5: TDpiMenuItem
         Tag = 1342
         OnClick = mManipClick
       end
-      object mManip6: TMenuItem
+      object mManip6: TDpiMenuItem
         Tag = 1604
         OnClick = mManipClick
       end
     end
-    object mMacro: TMenuItem
+    object mMacro: TDpiMenuItem
       Tag = 42
       GroupIndex = 1
-      object mEnhanceDef: TMenuItem
+      object mEnhanceDef: TDpiMenuItem
         Tag = 40
         OnClick = MenuClick
       end
-      object mCityTypes: TMenuItem
+      object mCityTypes: TDpiMenuItem
         Tag = 11
         OnClick = MenuClick
       end
     end
-    object mRandomMap: TMenuItem
+    object mRandomMap: TDpiMenuItem
       Tag = 71
       GroupIndex = 1
@@ -564 +564 @@
       OnClick = MenuClick
     end
-    object N3: TMenuItem
+    object N3: TDpiMenuItem
       Caption = '-'
       GroupIndex = 1
     end
-    object mWebsite: TMenuItem
+    object mWebsite: TDpiMenuItem
       Tag = 88
       GroupIndex = 1
       OnClick = MenuClick
     end
-    object N2: TMenuItem
+    object N2: TDpiMenuItem
       Caption = '-'
       GroupIndex = 1
     end
-    object mResign: TMenuItem
+    object mResign: TDpiMenuItem
       Tag = 2
       GroupIndex = 1
@@ -584 +584 @@
     end
   end
-  object UnitPopup: TPopupMenu
+  object UnitPopup: TDpiPopupMenu
     AutoPopup = False
     left = 130
     top = 60
-    object mdisband: TMenuItem
+    object mdisband: TDpiMenuItem
       Tag = 72
       ShortCut = 16452
       OnClick = MenuClick
     end
-    object mUtilize: TMenuItem
+    object mUtilize: TDpiMenuItem
       ShortCut = 90
       OnClick = MenuClick
     end
-    object N1: TMenuItem
+    object N1: TDpiMenuItem
       Caption = '-'
     end
-    object mcity: TMenuItem
+    object mcity: TDpiMenuItem
       ShortCut = 66
       OnClick = MenuClick
     end
-    object mPillage: TMenuItem
+    object mPillage: TDpiMenuItem
       Tag = 19
       ShortCut = 16464
       OnClick = MenuClick
     end
-    object N5: TMenuItem
+    object N5: TDpiMenuItem
       Caption = '-'
     end
-    object mhome: TMenuItem
+    object mhome: TDpiMenuItem
       ShortCut = 72
       OnClick = MenuClick
     end
-    object mLoad: TMenuItem
+    object mLoad: TDpiMenuItem
       Tag = 24
       ShortCut = 76
       OnClick = MenuClick
     end
-    object mUnload: TMenuItem
+    object mUnload: TDpiMenuItem
       Tag = 70
       ShortCut = 85
       OnClick = MenuClick
     end
-    object mSelectTransport: TMenuItem
+    object mSelectTransport: TDpiMenuItem
       Tag = 73
       ShortCut = 16468
       OnClick = MenuClick
     end
-    object mGoOn: TMenuItem
+    object mGoOn: TDpiMenuItem
       Tag = 13
       ShortCut = 71
       OnClick = MenuClick
     end
-    object mCancel: TMenuItem
+    object mCancel: TDpiMenuItem
       Tag = 1
       ShortCut = 16451
       OnClick = MenuClick
     end
-    object mRecover: TMenuItem
+    object mRecover: TDpiMenuItem
       Tag = 69
       ShortCut = 86
       OnClick = MenuClick
     end
-    object mwait: TMenuItem
+    object mwait: TDpiMenuItem
       Tag = 25
       ShortCut = 87
       OnClick = MenuClick
     end
-    object mnoorders: TMenuItem
+    object mnoorders: TDpiMenuItem
       Tag = 26
       ShortCut = 32
       OnClick = MenuClick
     end
-    object mstay: TMenuItem
+    object mstay: TDpiMenuItem
       Tag = 22
       ShortCut = 83
       OnClick = MenuClick
     end
-    object mCentre: TMenuItem
+    object mCentre: TDpiMenuItem
       Tag = 12
       ShortCut = 67
@@ -667 +667 @@
     end
   end
-  object StatPopup: TPopupMenu
+  object StatPopup: TDpiPopupMenu
     AutoPopup = False
     left = 90
     top = 60
-    object mUnitStat: TMenuItem
+    object mUnitStat: TDpiMenuItem
       Tag = 9
       ShortCut = 113
       OnClick = MenuClick
     end
-    object mCityStat: TMenuItem
+    object mCityStat: TDpiMenuItem
       Tag = 37
       ShortCut = 114
       OnClick = MenuClick
     end
-    object mScienceStat: TMenuItem
+    object mScienceStat: TDpiMenuItem
       Tag = 38
       ShortCut = 115
       OnClick = MenuClick
     end
-    object mEUnitStat: TMenuItem
+    object mEUnitStat: TDpiMenuItem
       Tag = 50
       ShortCut = 116
       OnClick = MenuClick
     end
-    object mDiagram: TMenuItem
+    object mDiagram: TDpiMenuItem
       Tag = 21
       ShortCut = 117
       OnClick = MenuClick
     end
-    object mWonders: TMenuItem
+    object mWonders: TDpiMenuItem
       Tag = 6
       ShortCut = 118
       OnClick = MenuClick
     end
-    object mShips: TMenuItem
+    object mShips: TDpiMenuItem
       Tag = 41
       ShortCut = 119
       OnClick = MenuClick
     end
-    object N4: TMenuItem
+    object N4: TDpiMenuItem
       Caption = '-'
     end
-    object mNations: TMenuItem
+    object mNations: TDpiMenuItem
       Tag = 55
       ShortCut = 120
       OnClick = MenuClick
     end
-    object mEmpire: TMenuItem
+    object mEmpire: TDpiMenuItem
       Tag = 3
       ShortCut = 121
       OnClick = MenuClick
     end
-    object mRevolution: TMenuItem
+    object mRevolution: TDpiMenuItem
       Tag = 89
       OnClick = MenuClick
     end
   end
-  object EditPopup: TPopupMenu
+  object EditPopup: TDpiPopupMenu
     left = 210
     top = 60
-    object mCreateUnit: TMenuItem
+    object mCreateUnit: TDpiMenuItem
       Tag = 47
     end
   end
-  object TerrainPopup: TPopupMenu
+  object TerrainPopup: TDpiPopupMenu
     left = 170
     top = 60
-    object mtrans: TMenuItem
+    object mtrans: TDpiMenuItem
       Tag = 273
       ShortCut = 79
       OnClick = MenuClick
     end
-    object mAfforest: TMenuItem
+    object mAfforest: TDpiMenuItem
       Tag = 301
       ShortCut = 77
       OnClick = MenuClick
     end
-    object mClear: TMenuItem
+    object mClear: TDpiMenuItem
       Tag = 298
       ShortCut = 73
       OnClick = MenuClick
     end
-    object mfort: TMenuItem
+    object mfort: TDpiMenuItem
       Tag = 276
       ShortCut = 70
       OnClick = MenuClick
     end
-    object mAirBase: TMenuItem
+    object mAirBase: TDpiMenuItem
       Tag = 272
       ShortCut = 65
       OnClick = MenuClick
     end
-    object mCanal: TMenuItem
+    object mCanal: TDpiMenuItem
       Tag = 279
       ShortCut = 78
       OnClick = MenuClick
     end
-    object mmine: TMenuItem
+    object mmine: TDpiMenuItem
       Tag = 302
       ShortCut = 77
       OnClick = MenuClick
     end
-    object mFarm: TMenuItem
+    object mFarm: TDpiMenuItem
       Tag = 300
       ShortCut = 73
       OnClick = MenuClick
     end
-    object mirrigation: TMenuItem
+    object mirrigation: TDpiMenuItem
       Tag = 299
       ShortCut = 73
       OnClick = MenuClick
     end
-    object mrr: TMenuItem
+    object mrr: TDpiMenuItem
       Tag = 297
       ShortCut = 82
       OnClick = MenuClick
     end
-    object mroad: TMenuItem
+    object mroad: TDpiMenuItem
       Tag = 296
       ShortCut = 82
       OnClick = MenuClick
     end
-    object mpollution: TMenuItem
+    object mpollution: TDpiMenuItem
       Tag = 274
       ShortCut = 80
       OnClick = MenuClick
     end
-    object mEnhance: TMenuItem
+    object mEnhance: TDpiMenuItem
       Tag = 295
       ShortCut = 69

branches/highdpi/LocalPlayer/Term.pas

@@ -26 +26 @@
 
   TMainScreen = class(TDrawDlg)
-    mBigTiles: TMenuItem;
+    mBigTiles: TDpiMenuItem;
     Timer1: TTimer;
-    GamePopup: TPopupMenu;
-    UnitPopup: TPopupMenu;
-    mIrrigation: TMenuItem;
-    mCity: TMenuItem;
-    mRoad: TMenuItem;
-    mMine: TMenuItem;
-    mPollution: TMenuItem;
-    mHome: TMenuItem;
-    mStay: TMenuItem;
-    mDisband: TMenuItem;
-    mWait: TMenuItem;
-    mNoOrders: TMenuItem;
-    MTrans: TMenuItem;
+    GamePopup: TDpiPopupMenu;
+    UnitPopup: TDpiPopupMenu;
+    mIrrigation: TDpiMenuItem;
+    mCity: TDpiMenuItem;
+    mRoad: TDpiMenuItem;
+    mMine: TDpiMenuItem;
+    mPollution: TDpiMenuItem;
+    mHome: TDpiMenuItem;
+    mStay: TDpiMenuItem;
+    mDisband: TDpiMenuItem;
+    mWait: TDpiMenuItem;
+    mNoOrders: TDpiMenuItem;
+    MTrans: TDpiMenuItem;
     UnitBtn: TButtonB;
-    mResign: TMenuItem;
-    mOptions: TMenuItem;
-    mEnMoves: TMenuItem;
-    mWaitTurn: TMenuItem;
-    mRep: TMenuItem;
-    mFort: TMenuItem;
-    mCentre: TMenuItem;
-    N1: TMenuItem;
-    mAirBase: TMenuItem;
-    N5: TMenuItem;
-    mCityTypes: TMenuItem;
-    mHelp: TMenuItem;
-    mCanal: TMenuItem;
-    mTest: TMenuItem;
-    mLocCodes: TMenuItem;
-    mLoad: TMenuItem;
-    StatPopup: TPopupMenu;
-    mCityStat: TMenuItem;
-    mUnitStat: TMenuItem;
-    mWonders: TMenuItem;
-    mScienceStat: TMenuItem;
-    mRR: TMenuItem;
-    mClear: TMenuItem;
-    mFarm: TMenuItem;
-    mAfforest: TMenuItem;
-    mRep0: TMenuItem;
-    mRep1: TMenuItem;
-    mRep2: TMenuItem;
-    mRep3: TMenuItem;
-    mRep4: TMenuItem;
-    mRep5: TMenuItem;
-    mRep7: TMenuItem;
-    mRep8: TMenuItem;
-    mRep9: TMenuItem;
-    mRep15: TMenuItem;
-    mCancel: TMenuItem;
-    mLog: TMenuItem;
-    mEUnitStat: TMenuItem;
-    mRep10: TMenuItem;
-    mEnAttacks: TMenuItem;
-    mEnNoMoves: TMenuItem;
-    mDiagram: TMenuItem;
-    mJump: TMenuItem;
-    mNations: TMenuItem;
-    mManip: TMenuItem;
-    mManip0: TMenuItem;
-    mManip1: TMenuItem;
-    mManip2: TMenuItem;
-    mManip3: TMenuItem;
-    mManip4: TMenuItem;
-    mManip5: TMenuItem;
-    mEnhanceDef: TMenuItem;
-    mEnhance: TMenuItem;
-    mShips: TMenuItem;
-    mMacro: TMenuItem;
-    mRun: TMenuItem;
-    N10: TMenuItem;
-    mRepList: TMenuItem;
-    mRepScreens: TMenuItem;
-    mRep11: TMenuItem;
-    mNames: TMenuItem;
-    mManip6: TMenuItem;
-    mRep12: TMenuItem;
-    mRandomMap: TMenuItem;
-    mUnload: TMenuItem;
-    mRecover: TMenuItem;
+    mResign: TDpiMenuItem;
+    mOptions: TDpiMenuItem;
+    mEnMoves: TDpiMenuItem;
+    mWaitTurn: TDpiMenuItem;
+    mRep: TDpiMenuItem;
+    mFort: TDpiMenuItem;
+    mCentre: TDpiMenuItem;
+    N1: TDpiMenuItem;
+    mAirBase: TDpiMenuItem;
+    N5: TDpiMenuItem;
+    mCityTypes: TDpiMenuItem;
+    mHelp: TDpiMenuItem;
+    mCanal: TDpiMenuItem;
+    mTest: TDpiMenuItem;
+    mLocCodes: TDpiMenuItem;
+    mLoad: TDpiMenuItem;
+    StatPopup: TDpiPopupMenu;
+    mCityStat: TDpiMenuItem;
+    mUnitStat: TDpiMenuItem;
+    mWonders: TDpiMenuItem;
+    mScienceStat: TDpiMenuItem;
+    mRR: TDpiMenuItem;
+    mClear: TDpiMenuItem;
+    mFarm: TDpiMenuItem;
+    mAfforest: TDpiMenuItem;
+    mRep0: TDpiMenuItem;
+    mRep1: TDpiMenuItem;
+    mRep2: TDpiMenuItem;
+    mRep3: TDpiMenuItem;
+    mRep4: TDpiMenuItem;
+    mRep5: TDpiMenuItem;
+    mRep7: TDpiMenuItem;
+    mRep8: TDpiMenuItem;
+    mRep9: TDpiMenuItem;
+    mRep15: TDpiMenuItem;
+    mCancel: TDpiMenuItem;
+    mLog: TDpiMenuItem;
+    mEUnitStat: TDpiMenuItem;
+    mRep10: TDpiMenuItem;
+    mEnAttacks: TDpiMenuItem;
+    mEnNoMoves: TDpiMenuItem;
+    mDiagram: TDpiMenuItem;
+    mJump: TDpiMenuItem;
+    mNations: TDpiMenuItem;
+    mManip: TDpiMenuItem;
+    mManip0: TDpiMenuItem;
+    mManip1: TDpiMenuItem;
+    mManip2: TDpiMenuItem;
+    mManip3: TDpiMenuItem;
+    mManip4: TDpiMenuItem;
+    mManip5: TDpiMenuItem;
+    mEnhanceDef: TDpiMenuItem;
+    mEnhance: TDpiMenuItem;
+    mShips: TDpiMenuItem;
+    mMacro: TDpiMenuItem;
+    mRun: TDpiMenuItem;
+    N10: TDpiMenuItem;
+    mRepList: TDpiMenuItem;
+    mRepScreens: TDpiMenuItem;
+    mRep11: TDpiMenuItem;
+    mNames: TDpiMenuItem;
+    mManip6: TDpiMenuItem;
+    mRep12: TDpiMenuItem;
+    mRandomMap: TDpiMenuItem;
+    mUnload: TDpiMenuItem;
+    mRecover: TDpiMenuItem;
     MapBtn0: TButtonC;
     MapBtn1: TButtonC;
     MapBtn4: TButtonC;
     MapBtn5: TButtonC;
-    EditPopup: TPopupMenu;
-    mCreateUnit: TMenuItem;
+    EditPopup: TDpiPopupMenu;
+    mCreateUnit: TDpiMenuItem;
     MapBtn6: TButtonC;
-    mDebugMap: TMenuItem;
-    mUtilize: TMenuItem;
-    mRep6: TMenuItem;
-    mEnemyMovement: TMenuItem;
-    mEnFastMoves: TMenuItem;
-    mOwnMovement: TMenuItem;
-    mSlowMoves: TMenuItem;
-    mFastMoves: TMenuItem;
-    mVeryFastMoves: TMenuItem;
-    mGoOn: TMenuItem;
-    mSound: TMenuItem;
-    mSoundOn: TMenuItem;
-    mSoundOnAlt: TMenuItem;
-    mSoundOff: TMenuItem;
-    N6: TMenuItem;
+    mDebugMap: TDpiMenuItem;
+    mUtilize: TDpiMenuItem;
+    mRep6: TDpiMenuItem;
+    mEnemyMovement: TDpiMenuItem;
+    mEnFastMoves: TDpiMenuItem;
+    mOwnMovement: TDpiMenuItem;
+    mSlowMoves: TDpiMenuItem;
+    mFastMoves: TDpiMenuItem;
+    mVeryFastMoves: TDpiMenuItem;
+    mGoOn: TDpiMenuItem;
+    mSound: TDpiMenuItem;
+    mSoundOn: TDpiMenuItem;
+    mSoundOnAlt: TDpiMenuItem;
+    mSoundOff: TDpiMenuItem;
+    N6: TDpiMenuItem;
     TerrainBtn: TButtonB;
-    TerrainPopup: TPopupMenu;
-    mScrolling: TMenuItem;
-    mScrollSlow: TMenuItem;
-    mScrollFast: TMenuItem;
-    mScrollOff: TMenuItem;
-    mPillage: TMenuItem;
-    mSelectTransport: TMenuItem;
-    mEmpire: TMenuItem;
-    N4: TMenuItem;
-    N2: TMenuItem;
-    mWebsite: TMenuItem;
-    N3: TMenuItem;
-    mRevolution: TMenuItem;
-    mRep13: TMenuItem;
+    TerrainPopup: TDpiPopupMenu;
+    mScrolling: TDpiMenuItem;
+    mScrollSlow: TDpiMenuItem;
+    mScrollFast: TDpiMenuItem;
+    mScrollOff: TDpiMenuItem;
+    mPillage: TDpiMenuItem;
+    mSelectTransport: TDpiMenuItem;
+    mEmpire: TDpiMenuItem;
+    N4: TDpiMenuItem;
+    N2: TDpiMenuItem;
+    mWebsite: TDpiMenuItem;
+    N3: TDpiMenuItem;
+    mRevolution: TDpiMenuItem;
+    mRep13: TDpiMenuItem;
     UnitInfoBtn: TButtonB;
     EOT: TEOTButton;
-    mAllyMovement: TMenuItem;
-    mAlSlowMoves: TMenuItem;
-    mAlFastMoves: TMenuItem;
-    N7: TMenuItem;
-    mEffectiveMovesOnly: TMenuItem;
-    N8: TMenuItem;
-    mAlEffectiveMovesOnly: TMenuItem;
-    mAlNoMoves: TMenuItem;
-    N9: TMenuItem;
-    mViewpoint: TMenuItem;
-    mTileSize: TMenuItem;
-    mNormalTiles: TMenuItem;
-    mSmallTiles: TMenuItem;
-    N11: TMenuItem;
+    mAllyMovement: TDpiMenuItem;
+    mAlSlowMoves: TDpiMenuItem;
+    mAlFastMoves: TDpiMenuItem;
+    N7: TDpiMenuItem;
+    mEffectiveMovesOnly: TDpiMenuItem;
+    N8: TDpiMenuItem;
+    mAlEffectiveMovesOnly: TDpiMenuItem;
+    mAlNoMoves: TDpiMenuItem;
+    N9: TDpiMenuItem;
+    mViewpoint: TDpiMenuItem;
+    mTileSize: TDpiMenuItem;
+    mNormalTiles: TDpiMenuItem;
+    mSmallTiles: TDpiMenuItem;
+    N11: TDpiMenuItem;
     MenuArea: TArea;
     TreasuryArea: TArea;
     ResearchArea: TArea;
     ManagementArea: TArea;
-    mTechTree: TMenuItem;
+    mTechTree: TDpiMenuItem;
     MovieSpeed1Btn: TButtonB;
     MovieSpeed2Btn: TButtonB;
     MovieSpeed3Btn: TButtonB;
     MovieSpeed4Btn: TButtonB;
-    N12: TMenuItem;
-    mRep14: TMenuItem;
+    N12: TDpiMenuItem;
+    mRep14: TDpiMenuItem;
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -266 +266 @@
     procedure EndNego;
     function IsPanelPixel(x, y: integer): boolean;
-    procedure InitPopup(Popup: TPopupMenu);
+    procedure InitPopup(Popup: TDpiPopupMenu);
     procedure SetMapOptions;
     procedure CheckMovieSpeedBtnState;
@@ -3448 +3448 @@
   for i := 0 to ComponentCount - 1 do
     if Components[i].Tag and $FF <> 0 then
-      if Components[i] is TMenuItem then
-      begin
-        TMenuItem(Components[i]).Caption := Phrases.Lookup('CONTROLS',
+      if Components[i] is TDpiMenuItem then
+      begin
+        TDpiMenuItem(Components[i]).Caption := Phrases.Lookup('CONTROLS',
           -1 + Components[i].Tag and $FF);
         for j := 0 to nSaveOption - 1 do
           if Components[i].Tag and $FF = SaveOption[j] then
-            TMenuItem(Components[i]).Checked := ((1 shl j) and OptionChecked) <> 0;
+            TDpiMenuItem(Components[i]).Checked := ((1 shl j) and OptionChecked) <> 0;
       end
       else if Components[i] is TButtonBase then
@@ -5188 +5188 @@
   i, uix, emix, p1, dx, dy, MouseLoc: integer;
   EditTileData: TEditTileData;
-  m, m2: TMenuItem;
+  m, m2: TDpiMenuItem;
   MoveAdviceData: TMoveAdviceData;
   DoCenter: boolean;
@@ -5338 +5338 @@
         if 1 shl p1 and MyRO.Alive <> 0 then
         begin
-          m := TMenuItem.Create(mCreateUnit);
+          m := TDpiMenuItem.Create(mCreateUnit);
           m.Caption := Tribe[p1].TPhrase('SHORTNAME');
           for emix := MyRO.nEnemyModel - 1 downto 0 do
@@ -5347 +5347 @@
               if Tribe[p1].ModelPicture[MyRO.EnemyModel[emix].mix].HGr = 0 then
                 InitEnemyModel(emix);
-              m2 := TMenuItem.Create(m);
+              m2 := TDpiMenuItem.Create(m);
               m2.Caption := Tribe[p1].ModelName[MyRO.EnemyModel[emix].mix];
               m2.Tag := p1 shl 16 + MyRO.EnemyModel[emix].mix;
@@ -6452 +6452 @@
   Shift: TShiftState);
 
-  procedure MenuClick_Check(Popup: TPopupMenu; Item: TMenuItem);
+  procedure MenuClick_Check(Popup: TDpiPopupMenu; Item: TDpiMenuItem);
   begin
     InitPopup(Popup);
@@ -7182 +7182 @@
 end;
 
-procedure TMainScreen.InitPopup(Popup: TPopupMenu);
+procedure TMainScreen.InitPopup(Popup: TDpiPopupMenu);
 var
   i, p1, Tile, Test: integer;
   NoSuper, extended, Multi, NeedSep, HaveCities: boolean;
-  LastSep, m: TMenuItem;
+  LastSep, m: TDpiMenuItem;
   mox: ^TModel;
 begin
@@ -7257 +7257 @@
         if (p1 = 0) or (1 shl p1 and G.RO[0].Alive <> 0) then
         begin
-          m := TMenuItem.Create(mViewpoint);
+          m := TDpiMenuItem.Create(mViewpoint);
           if p1 = 0 then
             m.Caption := Phrases.Lookup('SUPER')
@@ -7279 +7279 @@
         if (p1 = 0) or (1 shl p1 and G.RO[0].Alive <> 0) then
         begin
-          m := TMenuItem.Create(mDebugMap);
+          m := TDpiMenuItem.Create(mDebugMap);
           if p1 = 0 then
             m.Caption := Phrases2.Lookup('MENU_DEBUGMAPOFF')
@@ -7459 +7459 @@
 procedure TMainScreen.PanelBtnClick(Sender: TObject);
 var
-  Popup: TPopupMenu;
+  Popup: TDpiPopupMenu;
 begin
   if Sender = UnitBtn then
@@ -7467 +7467 @@
   InitPopup(Popup);
   if FullScreen then
-    Popup.Popup(Left + TControl(Sender).Left, Top + TControl(Sender).Top)
+    Popup.Popup(Left + TDpiControl(Sender).Left, Top + TDpiControl(Sender).Top)
   else
-    Popup.Popup(Left + TControl(Sender).Left + 4, Top + TControl(Sender).Top +
+    Popup.Popup(Left + TDpiControl(Sender).Left + 4, Top + TDpiControl(Sender).Top +
       GetSystemMetrics(SM_CYCAPTION) + 4);
 end;
@@ -7504 +7504 @@
 procedure TMainScreen.Toggle(Sender: TObject);
 begin
-  TMenuItem(Sender).Checked := not TMenuItem(Sender).Checked
+  TDpiMenuItem(Sender).Checked := not TDpiMenuItem(Sender).Checked
 end;
 
@@ -7590 +7590 @@
 procedure TMainScreen.mShowClick(Sender: TObject);
 begin
-  TMenuItem(Sender).Checked := not TMenuItem(Sender).Checked;
+  TDpiMenuItem(Sender).Checked := not TDpiMenuItem(Sender).Checked;
   SetMapOptions;
   MapValid := false;
@@ -7628 +7628 @@
         InitPopup(GamePopup);
         if FullScreen then
+          // GamePopup.FItems.Count
           GamePopup.Popup(Left, Top + TopBarHeight - 1)
         else
@@ -7789 +7790 @@
 procedure TMainScreen.mRepClicked(Sender: TObject);
 begin
-  with TMenuItem(Sender) do
+  with TDpiMenuItem(Sender) do
   begin
     Checked := not Checked;
@@ -7818 +7819 @@
 procedure TMainScreen.Radio(Sender: TObject);
 begin
-  TMenuItem(Sender).Checked := true;
+  TDpiMenuItem(Sender).Checked := true;
 end;
 
@@ -7825 +7826 @@
   Flag: integer;
 begin
-  with TMenuItem(Sender) do
+  with TDpiMenuItem(Sender) do
   begin
     Flag := 1 shl (Tag shr 8);
@@ -7984 +7985 @@
 procedure TMainScreen.ViewpointClick(Sender: TObject);
 begin
-  SetViewpoint(TMenuItem(Sender).Tag);
+  SetViewpoint(TDpiMenuItem(Sender).Tag);
 end;
 
 procedure TMainScreen.DebugMapClick(Sender: TObject);
 begin
-  SetDebugMap(TMenuItem(Sender).Tag);
+  SetDebugMap(TDpiMenuItem(Sender).Tag);
 end;
 
@@ -8029 +8030 @@
   OptionChecked := OptionChecked and soExtraMask;
   for i := 0 to ComponentCount - 1 do
-    if Components[i] is TMenuItem then
+    if Components[i] is TDpiMenuItem then
       for j := 0 to nSaveOption - 1 do
-        if TMenuItem(Components[i]).Checked and
-          (TMenuItem(Components[i]).Tag = SaveOption[j]) then
+        if TDpiMenuItem(Components[i]).Checked and
+          (TDpiMenuItem(Components[i]).Tag = SaveOption[j]) then
           inc(OptionChecked, 1 shl j);
 

branches/highdpi/Log.lfm

@@ -30 +30 @@
     OnMouseDown = ListMouseDown
   end
-  object LogPopup: TPopupMenu
+  object LogPopup: TDpiPopupMenu
     AutoPopup = False
     Left = 8
     Top = 8
-    object mInvalid: TMenuItem
+    object mInvalid: TDpiMenuItem
       Caption = 'Invalid Server Calls'
       OnClick = Toggle
     end
-    object mNegotiation: TMenuItem
+    object mNegotiation: TDpiMenuItem
       Caption = 'Negotiation'
       OnClick = Toggle
     end
-    object mTime: TMenuItem
+    object mTime: TDpiMenuItem
       Caption = 'Client Handover'
       OnClick = Toggle
     end
-    object N2: TMenuItem
+    object N2: TDpiMenuItem
       Caption = '-'
     end
-    object mLog0: TMenuItem
+    object mLog0: TDpiMenuItem
       Caption = 'AI Messages Off'
       Checked = True
@@ -55 +55 @@
       OnClick = mLogClick
     end
-    object mLog1: TMenuItem
+    object mLog1: TDpiMenuItem
       Tag = 1
       Caption = 'AI Messages Level 1'
@@ -61 +61 @@
       OnClick = mLogClick
     end
-    object mLog2: TMenuItem
+    object mLog2: TDpiMenuItem
       Tag = 2
       Caption = 'AI Messages Level 1+2'
@@ -67 +67 @@
       OnClick = mLogClick
     end
-    object mLog3: TMenuItem
+    object mLog3: TDpiMenuItem
       Tag = 999
       Caption = 'All AI Messages'
@@ -73 +73 @@
       OnClick = mLogClick
     end
-    object N1: TMenuItem
+    object N1: TDpiMenuItem
       Caption = '-'
     end
-    object mSlot: TMenuItem
+    object mSlot: TDpiMenuItem
       Caption = 'Nation <-> Slot'
       OnClick = mSlotClick
     end
-    object mClear: TMenuItem
+    object mClear: TDpiMenuItem
       Caption = 'Clear'
       OnClick = mClearClick

branches/highdpi/Log.pas

@@ -10 +10 @@
 type
   TLogDlg = class(TDpiForm)
-    LogPopup: TPopupMenu;
-    mLog0: TMenuItem;
-    mLog1: TMenuItem;
-    mLog2: TMenuItem;
-    mLog3: TMenuItem;
-    N1: TMenuItem;
-    mClear: TMenuItem;
-    mSlot: TMenuItem;
-    N2: TMenuItem;
-    mInvalid: TMenuItem;
-    mTime: TMenuItem;
+    LogPopup: TDpiPopupMenu;
+    mLog0: TDpiMenuItem;
+    mLog1: TDpiMenuItem;
+    mLog2: TDpiMenuItem;
+    mLog3: TDpiMenuItem;
+    N1: TDpiMenuItem;
+    mClear: TDpiMenuItem;
+    mSlot: TDpiMenuItem;
+    N2: TDpiMenuItem;
+    mInvalid: TDpiMenuItem;
+    mTime: TDpiMenuItem;
     List: TMemo;
-    mNegotiation: TMenuItem;
+    mNegotiation: TDpiMenuItem;
     procedure mLogClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
@@ -60 +60 @@
 procedure TLogDlg.mLogClick(Sender: TObject);
 begin
-  MaxLevel := TMenuItem(Sender).Tag;
-  TMenuItem(Sender).Checked := true;
+  MaxLevel := TDpiMenuItem(Sender).Tag;
+  TDpiMenuItem(Sender).Checked := true;
 end;
 
@@ -124 +124 @@
 procedure TLogDlg.Toggle(Sender: TObject);
 begin
-  TMenuItem(Sender).Checked := not TMenuItem(Sender).Checked;
+  TDpiMenuItem(Sender).Checked := not TDpiMenuItem(Sender).Checked;
 end;
 

branches/highdpi/Packages/CevoComponents/ScreenTools.pas

@@ -21 +21 @@
 {$ENDIF}
 procedure RestoreResolution;
-procedure EmptyMenu(MenuItems: TMenuItem; Keep: Integer = 0);
+procedure EmptyMenu(MenuItems: TDpiMenuItem; Keep: Integer = 0);
 function TurnToYear(Turn: integer): integer;
 function TurnToString(Turn: integer): string;
@@ -248 +248 @@
 end;
 
-procedure EmptyMenu(MenuItems: TMenuItem; Keep: Integer = 0);
-var
-  MenuItem: TMenuItem;
+procedure EmptyMenu(MenuItems: TDpiMenuItem; Keep: Integer = 0);
+var
+  MenuItem: TDpiMenuItem;
 begin
   while MenuItems.Count > Keep do begin

branches/highdpi/Packages/DpiControls/UDpiControls.pas

@@ -8 +8 @@
   Classes, SysUtils, LCLProc, LResources, Forms, FormEditingIntf, ProjectIntf,
   Controls, StdCtrls, fgl, Graphics, ComCtrls, ExtCtrls, LCLType, GraphType,
-  Types, CustApp, LMessages, LCLIntf;
+  Types, CustApp, LMessages, LCLIntf, Menus;
 
 type
@@ -483 +483 @@
     function GetVclForm: TForm; virtual;
     procedure UpdateVclControl; override;
-    procedure AfterConstruction; override;
   public
     VclForm: TForm;
+    procedure AfterConstruction; override;
     property ModalResult: TModalResult read GetModalResult write SetModalResult;
     function ShowModal: Integer; virtual;
@@ -796 +796 @@
   end;
 
+  { TDpiMenuItem }
+
+  TDpiMenuItem = class(TComponent)
+  private
+    FItems: TList;
+    FParent: TDpiMenuItem;
+    FOnClick: TNotifyEvent;
+    function GetCaption: TTranslateString;
+    function GetChecked: Boolean;
+    function GetCount: Integer;
+    function GetEnabled: Boolean;
+    function GetGroupIndex: Byte;
+    function GetItem(Index: Integer): TDpiMenuItem;
+    function GetOnClick: TNotifyEvent;
+    function GetRadioItem: Boolean;
+    function GetShortCut: TShortCut;
+    function GetVisible: Boolean;
+    function IsCaptionStored: Boolean;
+    function IsCheckedStored: Boolean;
+    function IsEnabledStored: Boolean;
+    function IsShortCutStored: Boolean;
+    function IsVisibleStored: Boolean;
+    procedure SetCaption(AValue: TTranslateString);
+    procedure SetChecked(AValue: Boolean);
+    procedure SetEnabled(AValue: Boolean);
+    procedure SetGroupIndex(AValue: Byte);
+    procedure SetOnClick(AValue: TNotifyEvent);
+    procedure SetRadioItem(AValue: Boolean);
+    procedure SetShortCut(AValue: TShortCut);
+    procedure SetVisible(AValue: Boolean);
+    procedure OnClickHandler(Sender: TObject);
+  protected
+    function GetVclMenuItem: TMenuItem; virtual;
+    procedure SetParentComponent(AValue: TComponent); override;
+  public
+    VclMenuItem: TMenuItem;
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
+    procedure Delete(Index: Integer);
+    procedure Add(Item: TDpiMenuItem);
+    procedure Insert(Index: Integer; Item: TDpiMenuItem);
+    function IndexOf(Item: TDpiMenuItem): Integer;
+    procedure Remove(Item: TDpiMenuItem);
+    property Items[Index: Integer]: TDpiMenuItem read GetItem; default;
+    property Count: Integer read GetCount;
+  published
+    property RadioItem: Boolean read GetRadioItem write SetRadioItem default False;
+    property ShortCut: TShortCut read GetShortCut write SetShortCut
+      stored IsShortCutStored default 0;
+    property Enabled: Boolean read GetEnabled write SetEnabled
+      stored IsEnabledStored default True;
+    property Visible: Boolean read GetVisible write SetVisible
+      stored IsVisibleStored default True;
+    property Checked: Boolean read GetChecked write SetChecked
+      stored IsCheckedStored default False;
+    property Caption: TTranslateString read GetCaption write SetCaption
+      stored IsCaptionStored;
+    property OnClick: TNotifyEvent read GetOnClick write SetOnClick;
+    property GroupIndex: Byte read GetGroupIndex write SetGroupIndex default 0;
+  end;
+
+  TDpiMenu = class(TComponent)
+  private
+    FItems: TDpiMenuItem;
+  protected
+    function GetVclMenu: TMenu; virtual;
+  public
+    property Items: TDpiMenuItem read FItems;
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
+  end;
+
+  { TDpiPopupMenu }
+
+  TDpiPopupMenu = class(TDpiMenu)
+  private
+    function GetAutoPopup: Boolean;
+    procedure SetAutoPopup(AValue: Boolean);
+  protected
+    function GetVclMenu: TMenu; override;
+    function GetVclPopupMenu: TPopupMenu; virtual;
+  public
+    VclPopupMenu: TPopupMenu;
+    procedure PopUp;
+    procedure PopUp(X, Y: Integer); virtual;
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
+  published
+    property AutoPopup: Boolean read GetAutoPopup write SetAutoPopup default True;
+  end;
+
 var
   DpiFormFileDesc: TDpiFormFileDesc;
@@ -818 +909 @@
 implementation
 
+uses
+  LCLStrConsts;
+
 resourcestring
   SDpiFormTitle = 'DpiForm form';
@@ -827 +921 @@
   DpiFormFileDesc := TDpiFormFileDesc.Create;
   RegisterProjectFileDescriptor(DpiFormFileDesc);
-  RegisterComponents('DpiControls', [TDpiButton, TDpiImage, TDpiPaintBox, TDpiListBox]);
+  RegisterComponents('DpiControls', [TDpiButton, TDpiImage, TDpiPaintBox,
+    TDpiListBox, TDpiPopupMenu]);
 end;
 
@@ -897 +992 @@
   Result := BitBlt(DestDC, ScaleToVcl(X), ScaleToVcl(Y), ScaleToVcl(Width),
     ScaleToVcl(Height), SrcDC, ScaleToVcl(XSrc), ScaleToVcl(YSrc), Rop);
+end;
+
+{ TDpiMenu }
+
+function TDpiMenu.GetVclMenu: TMenu;
+begin
+  Result := nil;
+end;
+
+constructor TDpiMenu.Create(AOwner: TComponent);
+begin
+  inherited;
+  FItems := TDpiMenuItem.Create(Self);
+end;
+
+destructor TDpiMenu.Destroy;
+begin
+  FreeAndNil(FItems);
+  inherited;
+end;
+
+{ TDpiMenuItem }
+
+function TDpiMenuItem.GetCaption: TTranslateString;
+begin
+  Result := GetVclMenuItem.Caption;
+end;
+
+function TDpiMenuItem.GetChecked: Boolean;
+begin
+  Result := GetVclMenuItem.Checked;
+end;
+
+function TDpiMenuItem.GetCount: Integer;
+begin
+  Result := FItems.Count;
+end;
+
+function TDpiMenuItem.GetEnabled: Boolean;
+begin
+  Result := GetVclMenuItem.Enabled;
+end;
+
+function TDpiMenuItem.GetGroupIndex: Byte;
+begin
+  Result := GetVclMenuItem.GroupIndex;
+end;
+
+function TDpiMenuItem.GetItem(Index: Integer): TDpiMenuItem;
+begin
+  Result := TDpiMenuItem(FItems[Index]);
+end;
+
+function TDpiMenuItem.GetOnClick: TNotifyEvent;
+begin
+  Result := FOnClick;
+end;
+
+function TDpiMenuItem.GetRadioItem: Boolean;
+begin
+  Result := GetVclMenuItem.RadioItem;
+end;
+
+function TDpiMenuItem.GetShortCut: TShortCut;
+begin
+  Result := GetVclMenuItem.ShortCut;
+end;
+
+function TDpiMenuItem.GetVisible: Boolean;
+begin
+  Result := GetVclMenuItem.Visible;
+end;
+
+function TDpiMenuItem.IsCaptionStored: Boolean;
+begin
+  Result := False;
+end;
+
+function TDpiMenuItem.IsCheckedStored: Boolean;
+begin
+  Result := False;
+end;
+
+function TDpiMenuItem.IsEnabledStored: Boolean;
+begin
+  Result := False;
+end;
+
+function TDpiMenuItem.IsShortCutStored: Boolean;
+begin
+  Result := False;
+end;
+
+function TDpiMenuItem.IsVisibleStored: Boolean;
+begin
+  Result := False;
+end;
+
+procedure TDpiMenuItem.SetCaption(AValue: TTranslateString);
+begin
+  GetVclMenuItem.Caption := AValue;
+end;
+
+procedure TDpiMenuItem.SetChecked(AValue: Boolean);
+begin
+  GetVclMenuItem.Checked := AValue;
+end;
+
+procedure TDpiMenuItem.SetEnabled(AValue: Boolean);
+begin
+  GetVclMenuItem.Enabled := AValue;
+end;
+
+procedure TDpiMenuItem.SetGroupIndex(AValue: Byte);
+begin
+  GetVclMenuItem.GroupIndex := AValue;
+end;
+
+procedure TDpiMenuItem.SetOnClick(AValue: TNotifyEvent);
+begin
+  FOnClick := AValue;
+end;
+
+procedure TDpiMenuItem.SetRadioItem(AValue: Boolean);
+begin
+  GetVclMenuItem.RadioItem := AValue;
+end;
+
+procedure TDpiMenuItem.SetShortCut(AValue: TShortCut);
+begin
+  GetVclMenuItem.ShortCut := AValue;
+end;
+
+procedure TDpiMenuItem.SetVisible(AValue: Boolean);
+begin
+  GetVclMenuItem.Visible := AValue;
+end;
+
+procedure TDpiMenuItem.OnClickHandler(Sender: TObject);
+begin
+  if Assigned(FOnClick) then
+    FOnClick(Self);
+end;
+
+procedure TDpiMenuItem.Delete(Index: Integer);
+begin
+  FItems.Delete(Index);
+  GetVclMenuItem.Delete(Index);
+end;
+
+procedure TDpiMenuItem.Add(Item: TDpiMenuItem);
+begin
+  Insert(GetCount, Item);
+end;
+
+procedure TDpiMenuItem.Insert(Index: Integer; Item: TDpiMenuItem);
+begin
+  FItems.Insert(Index, Item);
+  GetVclMenuItem.Insert(Index, Item.GetVclMenuItem);
+end;
+
+function TDpiMenuItem.IndexOf(Item: TDpiMenuItem): Integer;
+begin
+  if FItems = nil then
+    Result := -1
+  else
+    Result := FItems.IndexOf(Item);
+end;
+
+procedure TDpiMenuItem.Remove(Item: TDpiMenuItem);
+var
+  I: Integer;
+begin
+  I := IndexOf(Item);
+  if I < 0 then
+    raise EMenuError.Create(SMenuNotFound);
+  Delete(I);
+end;
+
+function TDpiMenuItem.GetVclMenuItem: TMenuItem;
+begin
+  if not Assigned(VclMenuItem) then begin
+    VclMenuItem := TMenuItem.Create(nil);
+    VclMenuItem.Name := 'Vcl' + Name;
+    VclMenuItem.OnClick := @OnClickHandler;
+  end;
+  Result := VclMenuItem;
+end;
+
+procedure TDpiMenuItem.SetParentComponent(AValue: TComponent);
+begin
+  if (FParent = AValue) then Exit;
+  if Assigned(FParent) then FParent.Remove(Self);
+  if Assigned(AValue) then
+  begin
+    if (AValue is TDpiMenu)
+      then TDpiMenu(AValue).Items.Add(Self)
+    else if (AValue is TDpiMenuItem)
+      then TDpiMenuItem(AValue).Add(Self)
+    else
+      raise Exception.Create('TDpiMenuItem.SetParentComponent: suggested parent not of type TDpiMenu or TDpiMenuItem');
+   end;
+end;
+
+constructor TDpiMenuItem.Create(AOwner: TComponent);
+begin
+  inherited;
+  FItems := TList.Create;
+end;
+
+destructor TDpiMenuItem.Destroy;
+begin
+  FreeAndNil(FItems);
+  inherited Destroy;
+end;
+
+{ TDpiPopupMenu }
+
+procedure TDpiPopupMenu.PopUp;
+var
+  Pos: TPoint;
+begin
+  Pos := DpiMouse.CursorPos;
+  Popup(Pos.X, Pos.Y);
+end;
+
+procedure TDpiPopupMenu.PopUp(X, Y: Integer);
+begin
+  GetVclPopupMenu.PopUp(ScaleToVcl(X), ScaleToVcl(Y));
+end;
+
+constructor TDpiPopupMenu.Create(AOwner: TComponent);
+begin
+  inherited;
+  GetVclPopupMenu;
+end;
+
+function TDpiPopupMenu.GetAutoPopup: Boolean;
+begin
+  Result := GetVclPopupMenu.AutoPopup;
+end;
+
+procedure TDpiPopupMenu.SetAutoPopup(AValue: Boolean);
+begin
+  GetVclPopupMenu.AutoPopup := AValue;
+end;
+
+function TDpiPopupMenu.GetVclMenu: TMenu;
+begin
+  Result := GetVclPopupMenu;
+end;
+
+function TDpiPopupMenu.GetVclPopupMenu: TPopupMenu;
+begin
+  if not Assigned(VclPopupMenu) then begin
+    VclPopupMenu := TPopupMenu.Create(nil);
+    if Assigned(Items.VclMenuItem) then Items.VclMenuItem.Free;
+    Items.VclMenuItem := VclPopupMenu.Items;
+  end;
+  Result := VclPopupMenu;
+end;
+
+destructor TDpiPopupMenu.Destroy;
+begin
+  if Assigned(VclPopupMenu) then FreeAndNil(VclPopupMenu);
+  inherited Destroy;
 end;
 
@@ -2213 +2574 @@
 procedure TDpiScreen.UpdateScreen;
 begin
-  Dpi := 96 * 2; //Screen.PixelsPerInch;
+//  Dpi := 96 * 2;
+  Dpi := Screen.PixelsPerInch;
 end;
 

branches/highdpi/Start.lfm

@@ -336 +336 @@
     Visible = False
   end
-  object PopupMenu1: TPopupMenu
+  object PopupMenu1: TDpiPopupMenu
     left = 8
     top = 8

branches/highdpi/Start.pas

@@ -61 +61 @@
 
   TStartDlg = class(TDrawDlg)
-    PopupMenu1: TPopupMenu;
+    PopupMenu1: TDpiPopupMenu;
     StartBtn: TButtonA;
     Down1Btn: TButtonC;
@@ -1299 +1299 @@
   if PlayerPopupIndex < 0 then
   begin // change default AI
-    BrainDefault := Brains[TMenuItem(Sender).Tag];
+    BrainDefault := Brains[TDpiMenuItem(Sender).Tag];
     SmartInvalidate(xDefault, yDefault, xDefault + 64, yDefault + 64);
   end
@@ -1306 +1306 @@
     if Assigned(PlayersBrain[PlayerPopupIndex]) then
       PlayersBrain[PlayerPopupIndex].Flags := PlayersBrain[PlayerPopupIndex].Flags and not fUsed;
-    if TMenuItem(Sender).Tag = -1 then begin
+    if TDpiMenuItem(Sender).Tag = -1 then begin
       PlayersBrain[PlayerPopupIndex] := nil;
       PlayerSlots[PlayerPopupIndex].DiffUpBtn.Visible := False;
@@ -1316 +1316 @@
       MultiControl := MultiControl and not (1 shl PlayerPopupIndex);
     end else begin
-      PlayersBrain[PlayerPopupIndex] := Brains[TMenuItem(Sender).Tag];
+      PlayersBrain[PlayerPopupIndex] := Brains[TDpiMenuItem(Sender).Tag];
       PlayerSlots[PlayerPopupIndex].DiffUpBtn.Visible := PlayersBrain[PlayerPopupIndex].Kind in [btTerm, btRandom, btAI];
       PlayerSlots[PlayerPopupIndex].DiffDownBtn.Visible := PlayersBrain[PlayerPopupIndex].Kind in [btTerm, btRandom, btAI];
@@ -1360 +1360 @@
 var
   J: Integer;
-  MenuItem: TMenuItem;
-begin
-  MenuItem := TMenuItem.Create(PopupMenu1);
+  MenuItem: TDpiMenuItem;
+begin
+  MenuItem := TDpiMenuItem.Create(PopupMenu1);
   if not Assigned(Brain) then MenuItem.Caption := Phrases.Lookup('NOMOD')
     else MenuItem.Caption := Brain.Name;
@@ -1381 +1381 @@
   I: Integer;
   FixedLines: integer;
-  MenuItem: TMenuItem;
+  MenuItem: TDpiMenuItem;
   AIBrains: TBrains;
 begin
@@ -1411 +1411 @@
       end;
     if PlayerPopupIndex > 0 then begin
-      MenuItem := TMenuItem.Create(PopupMenu1);
+      MenuItem := TDpiMenuItem.Create(PopupMenu1);
       MenuItem.Caption := '-';
       PopupMenu1.Items.Add(MenuItem);