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

Fixed errors in drawing the chat screen, made categorie tabs dynamically scaleable

This commit is contained in:
JappaWakka 2022-01-07 14:29:17 +01:00
parent e892977d70
commit 047d52832d
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
P3D/Network/ChatScreen.vb
View File

@ -591,7 +591,7 @@ Public Class ChatScreen
For Each l As String In lineArr For Each l As String In lineArr
Canvas.DrawRectangle(New Rectangle(100, (Core.windowSize.Height - 82) - offset - 64, Core.windowSize.Width - 200, 32), backC) Canvas.DrawRectangle(New Rectangle(100, (Core.windowSize.Height - 82) - offset - 64, Core.windowSize.Width - 200, 32), backC)
Core.SpriteBatch.DrawString(FontManager.ChatFont, l, New Vector2(100, (Core.windowSize.Height - 50 - 32) - offset - 64), c, 0.0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0.0F) Core.SpriteBatch.DrawString(FontManager.ChatFont, l, New Vector2(100 + 8, (Core.windowSize.Height - 50 - 32) - offset - 64), c, 0.0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0.0F)
offset += 32 offset += 32
items += 1 items += 1
Next Next
@ -675,21 +675,26 @@ Public Class ChatScreen
Private Sub DrawChatTabs() Private Sub DrawChatTabs()
Dim p = MouseHandler.MousePosition Dim p = MouseHandler.MousePosition
Dim globalText As String = "Global"
Dim globalTextWidth As Integer = CInt(FontManager.MainFont.MeasureString(globalText).X)
Dim commandsText As String = "Commands"
Dim commandsTextWidth As Integer = CInt(FontManager.MainFont.MeasureString(commandsText).X)
'First, draw global: 'First, draw global:
DrawChatTab(100, "global", HasNewGlobalMessages, "Global", ChatState = ChatStates.Global) DrawChatTab(100, "global", HasNewGlobalMessages, globalText, ChatState = ChatStates.Global)
If p.X >= 100 And p.X < 220 Then If p.X >= 100 And p.X < 100 + 48 + globalTextWidth Then
canClickOnTab = True canClickOnTab = True
canClickOnTabType = ChatStates.Global canClickOnTabType = ChatStates.Global
canClickOnTabText = "Global" canClickOnTabText = "Global"
End If End If
'Then, if active, draw the Commands tab: 'Then, if active, draw the Commands tab:
Dim x As Integer = 120 Dim x As Integer = CInt(48 + globalTextWidth)
If HasCommandChat = True Then If HasCommandChat = True Then
DrawChatTab(x + 100, "command", False, "Commands", ChatState = ChatStates.Command) DrawChatTab(x + 100, "command", False, commandsText, ChatState = ChatStates.Command)
x += 120 x += CInt(48 + commandsTextWidth)
If p.X >= 220 And p.X < 340 Then If p.X >= CInt(100 + 48 + globalTextWidth) And p.X < CInt(100 + 48 + globalTextWidth + 48 + commandsTextWidth) Then
canClickOnTab = True canClickOnTab = True
canClickOnTabType = ChatStates.Command canClickOnTabType = ChatStates.Command
canClickOnTabText = "Commands" canClickOnTabText = "Commands"
@ -752,7 +757,7 @@ Public Class ChatScreen
''' </summary> ''' </summary>
Private Shared Function DrawChatTab(ByVal xPosition As Integer, ByVal textureType As String, ByVal HasNewMessages As Boolean, ByVal Text As String, ByVal IsActive As Boolean) As Integer Private Shared Function DrawChatTab(ByVal xPosition As Integer, ByVal textureType As String, ByVal HasNewMessages As Boolean, ByVal Text As String, ByVal IsActive As Boolean) As Integer
Dim drawHeight As Integer = 32 Dim drawHeight As Integer = 32
Dim drawWidth As Integer = 120 Dim drawWidth As Integer = CInt(48 + FontManager.MainFont.MeasureString(Text).X)
If IsActive = False Then If IsActive = False Then
drawHeight = 24 drawHeight = 24
@ -780,7 +785,7 @@ Public Class ChatScreen
Core.SpriteBatch.Draw(texture, New Rectangle(xPosition, Core.windowSize.Height - 50 - drawHeight - 12, 24, 24), New Rectangle(48, 0, 24, 24), Color.White) Core.SpriteBatch.Draw(texture, New Rectangle(xPosition, Core.windowSize.Height - 50 - drawHeight - 12, 24, 24), New Rectangle(48, 0, 24, 24), Color.White)
End If End If
Core.SpriteBatch.DrawString(FontManager.MainFont, Text, New Vector2(xPosition + 32, CInt(Core.windowSize.Height - 50 + 4)), Color.White, 0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0F) Core.SpriteBatch.DrawString(FontManager.MainFont, Text, New Vector2(xPosition + 24 + 12, CInt(Core.windowSize.Height - 50 + drawHeight / 2 - FontManager.MainFont.MeasureString(Text).Y / 2)), Color.White, 0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0F)
Return drawWidth Return drawWidth
End Function End Function
@ -881,7 +886,7 @@ Public Class ChatScreen
For Each l As String In lineArr For Each l As String In lineArr
Canvas.DrawRectangle(New Rectangle(100, (Core.windowSize.Height - 82) - offset - 64, Core.windowSize.Width - 200, 32), New Color(0, 0, 0, opacity)) Canvas.DrawRectangle(New Rectangle(100, (Core.windowSize.Height - 82) - offset - 64, Core.windowSize.Width - 200, 32), New Color(0, 0, 0, opacity))
Core.SpriteBatch.DrawString(FontManager.ChatFont, l, New Vector2(100, (Core.windowSize.Height - 50 - 32) - offset - 64), New Color(c.R, c.G, c.B, CInt(opacity * 1.7)), 0.0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0.0F) Core.SpriteBatch.DrawString(FontManager.ChatFont, l, New Vector2(100 + 8, (Core.windowSize.Height - 50 - 32) - offset - 64), New Color(c.R, c.G, c.B, CInt(opacity * 1.7)), 0.0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0.0F)
offset += 32 offset += 32
Next Next
End If End If