Changeset 87
- Timestamp:
- Nov 15, 2014, 10:32:26 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Forms/UFormMain.lfm
r86 r87 5 5 Width = 775 6 6 Caption = 'xTactics' 7 ClientHeight = 59 27 ClientHeight = 595 8 8 ClientWidth = 775 9 9 Menu = MainMenu1 … … 18 18 object StatusBar1: TStatusBar 19 19 Left = 0 20 Height = 2 921 Top = 56 320 Height = 26 21 Top = 569 22 22 Width = 775 23 23 Panels = < … … 35 35 object ToolBar1: TToolBar 36 36 Left = 0 37 Height = 56 337 Height = 569 38 38 Top = 0 39 39 Width = 40 … … 116 116 object PaintBox1: TPaintBox 117 117 Left = 40 118 Height = 56 3118 Height = 569 119 119 Top = 0 120 120 Width = 735 121 121 Align = alClient 122 122 OnMouseDown = PaintBox1MouseDown 123 OnMouseLeave = PaintBox1MouseLeave 123 124 OnMouseMove = PaintBox1MouseMove 124 125 OnMouseUp = PaintBox1MouseUp 125 OnMouseLeave = PaintBox1MouseLeave126 126 OnMouseWheelDown = PaintBox1MouseWheelDown 127 127 OnMouseWheelUp = PaintBox1MouseWheelUp … … 198 198 end 199 199 object Timer1: TTimer 200 Interval = 10200 Interval = 20 201 201 OnTimer = Timer1Timer 202 202 left = 154 -
trunk/Forms/UFormMain.pas
r86 r87 11 11 const 12 12 ZoomFactor = 1.5; 13 MouseMinDiff = 6; 13 14 14 15 type … … 99 100 MoveActive: Boolean; 100 101 RedrawPending: Boolean; 102 Drawing: Boolean; 101 103 DrawDuration: TDateTime; 102 104 LastTimerTime: TDateTime; … … 162 164 NewCaption: string; 163 165 begin 164 if RedrawPending then begin 166 if RedrawPending and not Drawing then begin 167 Drawing := True; 165 168 if not Core.DevelMode then RedrawPending := False; 166 169 TimerPeriod := (9 * TimerPeriod + (Now - LastTimerTime)) / 10; … … 173 176 NewCaption := Core.Game.CurrentPlayer.Name + ' - ' + STurn + ' ' + IntToStr(Core.Game.TurnCounter) + ' - ' + NewCaption; 174 177 Caption := NewCaption; 178 Drawing := False; 175 179 end; 176 180 end; … … 221 225 begin 222 226 {$IFDEF Linux} 223 PaintBox1.ControlStyle := PaintBox1.ControlStyle + [csOpaque];227 //PaintBox1.ControlStyle := PaintBox1.ControlStyle + [csOpaque]; 224 228 {$ENDIF} 225 229 //DoubleBuffered := True; … … 355 359 if Assigned(Core.Game.CurrentPlayer) then begin 356 360 if MoveActive then 361 if (Abs(StartMousePoint.X - X) > MouseMinDiff) or (Abs(StartMousePoint.Y - Y) > MouseMinDiff) then 357 362 with Core.Game.CurrentPlayer do begin 358 363 if Mode = pmHuman then begin … … 384 389 procedure TFormMain.PaintBox1MouseUp(Sender: TObject; Button: TMouseButton; 385 390 Shift: TShiftState; X, Y: Integer); 386 const387 MouseMinDiff = 10;388 391 begin 389 392 if (Abs(StartMousePoint.X - X) < MouseMinDiff) and (Abs(StartMousePoint.Y - Y) < MouseMinDiff) then begin -
trunk/Forms/UFormNew.lfm
r82 r87 1 1 object FormNew: TFormNew 2 Left = 9872 Left = 624 3 3 Height = 528 4 Top = 5004 Top = 313 5 5 Width = 745 6 6 Caption = 'New game' … … 52 52 object TabSheet1: TTabSheet 53 53 Caption = 'Players' 54 ClientHeight = 42 254 ClientHeight = 425 55 55 ClientWidth = 739 56 56 object ListView1: TListView … … 121 121 object TabSheet2: TTabSheet 122 122 Caption = 'Map' 123 ClientHeight = 42 2123 ClientHeight = 425 124 124 ClientWidth = 739 125 125 object Label1: TLabel … … 337 337 object TabSheet3: TTabSheet 338 338 Caption = 'Rules' 339 ClientHeight = 42 2339 ClientHeight = 425 340 340 ClientWidth = 739 341 341 object RadioGroupGrowCells: TRadioGroup … … 353 353 ChildSizing.Layout = cclLeftToRightThenTopToBottom 354 354 ChildSizing.ControlsPerLine = 1 355 ClientHeight = 78355 ClientHeight = 81 356 356 ClientWidth = 308 357 357 Items.Strings = ( … … 364 364 object Label6: TLabel 365 365 Left = 8 366 Height = 2 5366 Height = 22 367 367 Top = 248 368 Width = 1 29368 Width = 114 369 369 Caption = 'Win objective:' 370 370 ParentColor = False … … 372 372 object ComboBoxWinObjective: TComboBox 373 373 Left = 232 374 Height = 3 7374 Height = 34 375 375 Top = 240 376 376 Width = 328 … … 399 399 ChildSizing.Layout = cclLeftToRightThenTopToBottom 400 400 ChildSizing.ControlsPerLine = 1 401 ClientHeight = 49401 ClientHeight = 52 402 402 ClientWidth = 301 403 403 Items.Strings = ( … … 409 409 object CheckBoxFogOfWar: TCheckBox 410 410 Left = 336 411 Height = 2 7411 Height = 24 412 412 Top = 24 413 Width = 1 20413 Width = 106 414 414 Caption = 'Fog of war' 415 415 TabOrder = 3 -
trunk/xtactics.lpi
r75 r87 111 111 <HasResources Value="True"/> 112 112 <ResourceBaseClass Value="Form"/> 113 <UnitName Value="UFormPlayer"/>114 113 </Unit3> 115 114 <Unit4>
Note:
See TracChangeset
for help on using the changeset viewer.