edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 18:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes to color picker

Browse source
This commit is contained in:
Дядя Женя 2020-10-30 22:30:06 +03:00
parent 638a82b9bb
commit c77648362d
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/game/client/components/menus_settings.cpp
View file

@ -1768,11 +1768,12 @@ void CMenus::RenderSettingsHUD(CUIRect MainView)
char LineBuilder[128]; char LineBuilder[128];
float Width; float Width;
float TempY = Y; float TempY = Y;
constexpr float RealBackgroundRounding = CChat::MESSAGE_ROUNDING * 2.0f;
if(g_Config.m_ClShowChatSystem) if(g_Config.m_ClShowChatSystem)
{ {
Width = TextRender()->TextWidth(0, RealFontSize, "*** 'Evgesha' entered and joined the game", -1, -1); Width = TextRender()->TextWidth(0, RealFontSize, "*** 'Evgesha' entered and joined the game", -1, -1);
RenderTools()->DrawRoundRectExt(X - RealMsgPaddingX / 2.0f, TempY - RealMsgPaddingY / 2.0f, Width + RealMsgPaddingX, RealFontSize + RealMsgPaddingY, 8.0f, CUI::CORNER_ALL); RenderTools()->DrawRoundRectExt(X - RealMsgPaddingX / 2.0f, TempY - RealMsgPaddingY / 2.0f, Width + RealMsgPaddingX, RealFontSize + RealMsgPaddingY, RealBackgroundRounding, CUI::CORNER_ALL);
TempY += RealOffsetY; TempY += RealOffsetY;
} }
@ -1782,7 +1783,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView)
str_copy(LineBuilder, "DDRacer2002: Hey, how are you ", sizeof(LineBuilder)); str_copy(LineBuilder, "DDRacer2002: Hey, how are you ", sizeof(LineBuilder));
str_append(LineBuilder, aBuf, sizeof(LineBuilder)); str_append(LineBuilder, aBuf, sizeof(LineBuilder));
Width = TextRender()->TextWidth(0, RealFontSize, LineBuilder, -1, -1); Width = TextRender()->TextWidth(0, RealFontSize, LineBuilder, -1, -1);
RenderTools()->DrawRoundRectExt(X - RealMsgPaddingX / 2.0f, TempY - RealMsgPaddingY / 2.0f, Width + RealMsgPaddingX + RealMsgPaddingTee, RealFontSize + RealMsgPaddingY, 8.0f, CUI::CORNER_ALL); RenderTools()->DrawRoundRectExt(X - RealMsgPaddingX / 2.0f, TempY - RealMsgPaddingY / 2.0f, Width + RealMsgPaddingX + RealMsgPaddingTee, RealFontSize + RealMsgPaddingY, RealBackgroundRounding, CUI::CORNER_ALL);
TempY += RealOffsetY; TempY += RealOffsetY;
if(g_Config.m_ClShowIDs) if(g_Config.m_ClShowIDs)
@ -1790,7 +1791,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView)
else else
str_copy(LineBuilder, "Your Teammate: Let's speedrun this!", sizeof(LineBuilder)); str_copy(LineBuilder, "Your Teammate: Let's speedrun this!", sizeof(LineBuilder));
Width = TextRender()->TextWidth(0, RealFontSize, LineBuilder, -1, -1); Width = TextRender()->TextWidth(0, RealFontSize, LineBuilder, -1, -1);
RenderTools()->DrawRoundRectExt(X - RealMsgPaddingX / 2.0f, TempY - RealMsgPaddingY / 2.0f, Width + RealMsgPaddingX + RealMsgPaddingTee, RealFontSize + RealMsgPaddingY, 8.0f, CUI::CORNER_ALL); RenderTools()->DrawRoundRectExt(X - RealMsgPaddingX / 2.0f, TempY - RealMsgPaddingY / 2.0f, Width + RealMsgPaddingX + RealMsgPaddingTee, RealFontSize + RealMsgPaddingY, RealBackgroundRounding, CUI::CORNER_ALL);
TempY += RealOffsetY; TempY += RealOffsetY;
if(g_Config.m_ClShowIDs) if(g_Config.m_ClShowIDs)
@ -1798,7 +1799,7 @@ void CMenus::RenderSettingsHUD(CUIRect MainView)
else else
str_copy(LineBuilder, "♥ Friend: Hello there", sizeof(LineBuilder)); str_copy(LineBuilder, "♥ Friend: Hello there", sizeof(LineBuilder));
Width = TextRender()->TextWidth(0, RealFontSize, LineBuilder, -1, -1); Width = TextRender()->TextWidth(0, RealFontSize, LineBuilder, -1, -1);
RenderTools()->DrawRoundRectExt(X - RealMsgPaddingX / 2.0f, TempY - RealMsgPaddingY / 2.0f, Width + RealMsgPaddingX + RealMsgPaddingTee, RealFontSize + RealMsgPaddingY, 8.0f, CUI::CORNER_ALL); RenderTools()->DrawRoundRectExt(X - RealMsgPaddingX / 2.0f, TempY - RealMsgPaddingY / 2.0f, Width + RealMsgPaddingX + RealMsgPaddingTee, RealFontSize + RealMsgPaddingY, RealBackgroundRounding, CUI::CORNER_ALL);
TempY += RealOffsetY; TempY += RealOffsetY;
if(g_Config.m_ClShowIDs) if(g_Config.m_ClShowIDs)
@ -1806,11 +1807,11 @@ void CMenus::RenderSettingsHUD(CUIRect MainView)
else else
str_copy(LineBuilder, "Spammer [6]: Hey fools, I'm spamming here!", sizeof(LineBuilder)); str_copy(LineBuilder, "Spammer [6]: Hey fools, I'm spamming here!", sizeof(LineBuilder));
Width = TextRender()->TextWidth(0, RealFontSize, LineBuilder, -1, -1); Width = TextRender()->TextWidth(0, RealFontSize, LineBuilder, -1, -1);
RenderTools()->DrawRoundRectExt(X - RealMsgPaddingX / 2.0f, TempY - RealMsgPaddingY / 2.0f, Width + RealMsgPaddingX + RealMsgPaddingTee, RealFontSize + RealMsgPaddingY, 8.0f, CUI::CORNER_ALL); RenderTools()->DrawRoundRectExt(X - RealMsgPaddingX / 2.0f, TempY - RealMsgPaddingY / 2.0f, Width + RealMsgPaddingX + RealMsgPaddingTee, RealFontSize + RealMsgPaddingY, RealBackgroundRounding, CUI::CORNER_ALL);
TempY += RealOffsetY; TempY += RealOffsetY;
Width = TextRender()->TextWidth(0, RealFontSize, "*** Echo command executed", -1, -1); Width = TextRender()->TextWidth(0, RealFontSize, "*** Echo command executed", -1, -1);
RenderTools()->DrawRoundRectExt(X - RealMsgPaddingX / 2.0f, TempY - RealMsgPaddingY / 2.0f, Width + RealMsgPaddingX, RealFontSize + RealMsgPaddingY, 8.0f, CUI::CORNER_ALL); RenderTools()->DrawRoundRectExt(X - RealMsgPaddingX / 2.0f, TempY - RealMsgPaddingY / 2.0f, Width + RealMsgPaddingX, RealFontSize + RealMsgPaddingY, RealBackgroundRounding, CUI::CORNER_ALL);
TempY += RealOffsetY; TempY += RealOffsetY;
Graphics()->QuadsEnd(); Graphics()->QuadsEnd();
@ -1820,12 +1821,13 @@ void CMenus::RenderSettingsHUD(CUIRect MainView)
constexpr int PreviewTeeCount = 4; constexpr int PreviewTeeCount = 4;
constexpr float RealTeeSize = CChat::MESSAGE_TEE_SIZE * 2; constexpr float RealTeeSize = CChat::MESSAGE_TEE_SIZE * 2;
constexpr float RealTeeSizeHalved = CChat::MESSAGE_TEE_SIZE; constexpr float RealTeeSizeHalved = CChat::MESSAGE_TEE_SIZE;
constexpr float TWSkinUnreliableOffset = 0.5f; constexpr float TWSkinUnreliableOffset = -0.25f;
constexpr float OffsetTeeY = RealTeeSizeHalved / 2.0f; constexpr float OffsetTeeY = RealTeeSizeHalved;
const float FullHeightMinusTee = RealOffsetY - RealTeeSize; const float FullHeightMinusTee = RealOffsetY - RealTeeSize;
CTeeRenderInfo RenderInfo[PreviewTeeCount]; CTeeRenderInfo RenderInfo[PreviewTeeCount];
// Load skins if needed
if(g_Config.m_ClChatTee) if(g_Config.m_ClChatTee)
{ {
int DefaultInd = GameClient()->m_pSkins->Find("default"); int DefaultInd = GameClient()->m_pSkins->Find("default");