tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make NotificationPopup work at different scales

This commit is contained in:
JappaWakka 2025-01-24 14:05:52 +01:00
parent 021d79d08d
commit 69f70919b6
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
P3D/Overworld/NotificationPopup.vb
View File

@ -59,7 +59,14 @@ Public Class NotificationPopup
FrameSizeBack = CInt(BackTexture.Width / 3) FrameSizeBack = CInt(BackTexture.Width / 3)
_background = TextureManager.GetTexture(BackTexture, New Rectangle(CInt(_backgroundIndex.X * FrameSizeBack), CInt(_backgroundIndex.Y * FrameSizeBack), FrameSizeBack, FrameSizeBack)) _background = TextureManager.GetTexture(BackTexture, New Rectangle(CInt(_backgroundIndex.X * FrameSizeBack), CInt(_backgroundIndex.Y * FrameSizeBack), FrameSizeBack, FrameSizeBack))
_positionY = CInt(0 - _size.Height * (FrameSizeBack / 3) * _scale - (FrameSizeBack / 3 * _scale) - 5) Dim BackGroundScaleY As Integer = 1
If SpriteBatch.InterfaceScale > 1 Then
BackGroundScaleY = 2
ElseIf SpriteBatch.InterfaceScale < 1 Then
BackGroundScaleY = -2
End If
_positionY = CInt(0 - CInt(CInt(_size.Height + BackGroundScaleY) * (FrameSizeBack / 3) * _scale) - (FrameSizeBack / 3 * _scale) - 5)
If IconIndex <> -1 Then If IconIndex <> -1 Then
_iconIndex = New Vector2(IconIndex, 0) _iconIndex = New Vector2(IconIndex, 0)
@ -104,9 +111,16 @@ Public Class NotificationPopup
_started = True _started = True
End If End If
Dim BackGroundScaleY As Integer = 1
If SpriteBatch.InterfaceScale > 1 Then
BackGroundScaleY = 2
ElseIf SpriteBatch.InterfaceScale < 1 Then
BackGroundScaleY = -2
End If
If _waitForInput = True Then If _waitForInput = True Then
If Me._positionY < 5.0F Then If Me._positionY < 5.0F Then
Me._positionY += CInt(0.7 * (FrameSizeBack / 3 * _scale) / _size.Height) Me._positionY += CInt((0.7 * (FrameSizeBack / 3) / (_size.Height + BackGroundScaleY)) * SpriteBatch.InterfaceScale)
Else Else
If _soundEffect IsNot "" Then If _soundEffect IsNot "" Then
SoundManager.PlaySound("Notifications\" & _soundEffect) SoundManager.PlaySound("Notifications\" & _soundEffect)
@ -116,7 +130,7 @@ Public Class NotificationPopup
Else Else
If Date.Now < _delayDate Then If Date.Now < _delayDate Then
If Me._positionY < 5.0F Then If Me._positionY < 5.0F Then
Me._positionY += CInt(0.7 * (FrameSizeBack / 3 * _scale) / _size.Height) Me._positionY += CInt((0.7 * (FrameSizeBack / 3) / (_size.Height + BackGroundScaleY)) * SpriteBatch.InterfaceScale)
Else Else
If _soundEffect IsNot "" Then If _soundEffect IsNot "" Then
SoundManager.PlaySound("Notifications\" & _soundEffect) SoundManager.PlaySound("Notifications\" & _soundEffect)
@ -124,10 +138,10 @@ Public Class NotificationPopup
End If End If
End If End If
Else Else
Dim BackY As Integer = CInt(0 - _size.Height * (FrameSizeBack / 3) * _scale - (FrameSizeBack / 3 * _scale) - 5) Dim BackY As Integer = CInt(0 - CInt(CInt(_size.Height + BackGroundScaleY) * (FrameSizeBack / 3) * _scale) - (FrameSizeBack / 3 * _scale) - 5)
If Me._interacted = True OrElse _forceAccept = True Then If Me._interacted = True OrElse _forceAccept = True Then
If Me._positionY > BackY Then If Me._positionY > BackY Then
Me._positionY -= CInt(1.6 * (FrameSizeBack / 3 * _scale) / _size.Height) Me._positionY -= CInt((1.6 * (FrameSizeBack / 3) / (_size.Height + BackGroundScaleY)) * SpriteBatch.InterfaceScale)
If Me._positionY <= BackY Then If Me._positionY <= BackY Then
Me._positionY = BackY Me._positionY = BackY
If Me._scriptFile <> "" Then If Me._scriptFile <> "" Then
@ -138,7 +152,7 @@ Public Class NotificationPopup
End If End If
Else Else
If Me._positionY > BackY Then If Me._positionY > BackY Then
Me._positionY -= CInt(1.0 * (FrameSizeBack / 3 * _scale) / _size.Height) Me._positionY -= CInt((1.0 * (FrameSizeBack / 3) / (_size.Height + BackGroundScaleY)) * SpriteBatch.InterfaceScale)
If Me._positionY <= BackY Then If Me._positionY <= BackY Then
Me._positionY = BackY Me._positionY = BackY
Me.IsReady = True Me.IsReady = True
@ -167,13 +181,20 @@ Public Class NotificationPopup
_size.Height += 1 _size.Height += 1
End While End While
Dim BackGroundOffsetX As Integer = CInt(Core.windowSize.Width - (_size.Width * (FrameSizeBack / 3) * _scale) - (FrameSizeBack / 3) * 2 - 5) Dim BackGroundOffsetX As Integer = CInt(Core.windowSize.Width - (_size.Width * (FrameSizeBack / 3 * _scale)) - (FrameSizeBack / 3) * _scale - (5 * SpriteBatch.InterfaceScale))
Dim BackGroundScaleY As Integer = 0
If SpriteBatch.InterfaceScale > 1 Then
BackGroundScaleY = 2
ElseIf SpriteBatch.InterfaceScale < 1 Then
BackGroundScaleY = -2
End If
'Draw the frame. 'Draw the frame.
Canvas.DrawImageBorder(_background, CInt(_scale), New Rectangle(BackGroundOffsetX, CInt(Me._positionY), CInt(_size.Width * (FrameSizeBack / 3) * _scale), CInt(_size.Height * (FrameSizeBack / 3) * _scale))) Canvas.DrawImageBorder(_background, CInt(_scale), New Rectangle(BackGroundOffsetX, CInt(Me._positionY), CInt(_size.Width * (FrameSizeBack / 3) * _scale), CInt(CInt(_size.Height + BackGroundScaleY) * (FrameSizeBack / 3) * _scale)))
'Draw the icon. 'Draw the icon.
Core.SpriteBatch.DrawInterface(_icon, New Rectangle(CInt(BackGroundOffsetX + (FrameSizeBack / 3 + 3) * _scale - _icon.Width / 3), CInt(Me._positionY + ((FrameSizeBack / 3 * _size.Height / 2) - FrameSizeBack / 3 * 0.5) * _scale - _icon.Width / 3), CInt(_icon.Width * _scale), CInt(_icon.Height * _scale)), Color.White) Core.SpriteBatch.Draw(_icon, New Rectangle(CInt(BackGroundOffsetX + ((FrameSizeBack / 3 + 3) * _scale) - _icon.Width / 3), CInt(Me._positionY + ((FrameSizeBack / 3 * _size.Height / 2) - FrameSizeBack / 3 * 0.5) * _scale - _icon.Width / 3), CInt(_icon.Width * _scale), CInt(_icon.Height * _scale)), Color.White)
Dim TextOffset = CInt(BackGroundOffsetX + FrameSizeBack / 3 * _scale * 4) Dim TextOffset = CInt(BackGroundOffsetX + FrameSizeBack / 3 * _scale * 4)
If TextBody <> "" Then If TextBody <> "" Then
@ -194,10 +215,10 @@ Public Class NotificationPopup
If Me._scriptFile <> "" OrElse _waitForInput = True Then If Me._scriptFile <> "" OrElse _waitForInput = True Then
InteractText = "[" & Localization.GetString("game_notification_accept") & "]" InteractText = "[" & Localization.GetString("game_notification_accept") & "]"
End If End If
Dim InteractOffset As Vector2 = New Vector2(CInt(Core.windowSize.Width - FrameSizeBack / 3 * _scale - FontManager.InGameFont.MeasureString(InteractText).X * _scale / 2), CInt(Me._positionY + _size.Height * (FrameSizeBack / 3) * _scale + 5)) Dim InteractOffset As Vector2 = New Vector2(CInt(BackGroundOffsetX + (_size.Width * (FrameSizeBack / 3 * _scale)) - FontManager.InGameFont.MeasureString(InteractText).X * _scale / 2), CInt(Me._positionY + ((CInt(_size.Height + BackGroundScaleY) * (FrameSizeBack / 3 * _scale)) + (5 * _scale))))
Core.SpriteBatch.DrawInterface(_background, New Rectangle(CInt(InteractOffset.X), CInt(InteractOffset.Y), CInt(FontManager.InGameFont.MeasureString(InteractText).X * _scale / 2), CInt(FontManager.InGameFont.MeasureString(InteractText).Y * _scale / 2)), New Rectangle(CInt(FrameSizeBack / 3), CInt(FrameSizeBack / 3), CInt(FrameSizeBack / 3), CInt(FrameSizeBack / 3)), Color.White) Core.SpriteBatch.Draw(_background, New Rectangle(CInt(InteractOffset.X), CInt(InteractOffset.Y), CInt(FontManager.InGameFont.MeasureString(InteractText).X * _scale / 2), CInt(FontManager.InGameFont.MeasureString(InteractText).Y * _scale / 2)), New Rectangle(CInt(FrameSizeBack / 3), CInt(FrameSizeBack / 3), CInt(FrameSizeBack / 3), CInt(FrameSizeBack / 3)), Color.White)
Core.SpriteBatch.DrawString(FontManager.InGameFont, InteractText, New Vector2(CInt(InteractOffset.X), CInt(InteractOffset.Y)), Color.Black) Core.SpriteBatch.DrawString(FontManager.InGameFont, InteractText, New Vector2(CInt(InteractOffset.X), CInt(InteractOffset.Y)), Color.Black, 0.0F, Vector2.Zero, CSng(_scale / 2), SpriteEffects.None, 0.0F)
End Sub End Sub
End Class End Class