edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clang Format

Browse source
This commit is contained in:
VoxelDoesCode 2022-08-24 16:17:04 -04:00
parent fa98ad1e36
commit 216d4421ce
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game/client/components/menus_demo.cpp
View file

@ -47,7 +47,8 @@ int CMenus::DoButton_FontIcon(CButtonContainer *pButtonContainer, const char *pT
SLabelProperties Props; SLabelProperties Props;
UI()->DoLabel(&Temp, pText, Temp.h * CUI::ms_FontmodHeight, TEXTALIGN_CENTER, Props); UI()->DoLabel(&Temp, pText, Temp.h * CUI::ms_FontmodHeight, TEXTALIGN_CENTER, Props);
if (!Enabled){ if(!Enabled)
{
TextRender()->TextColor(ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f)); TextRender()->TextColor(ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f));
TextRender()->TextOutlineColor(ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f)); TextRender()->TextOutlineColor(ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f));
UI()->DoLabel(&Temp, "\xEF\x9C\x95", Temp.h * CUI::ms_FontmodHeight, TEXTALIGN_CENTER, Props); UI()->DoLabel(&Temp, "\xEF\x9C\x95", Temp.h * CUI::ms_FontmodHeight, TEXTALIGN_CENTER, Props);
@ -1160,7 +1161,7 @@ void CMenus::RenderDemoList(CUIRect MainView)
TextRender()->SetCurFont(TextRender()->GetFont(TEXT_FONT_ICON_FONT)); TextRender()->SetCurFont(TextRender()->GetFont(TEXT_FONT_ICON_FONT));
TextRender()->TextColor(IconColor); TextRender()->TextColor(IconColor);
UI()->DoLabel(&FileIcon, Item.m_IsDir ? "\xEF\x81\xBB": "\xEF\x80\x88", 12.0f, TEXTALIGN_LEFT); UI()->DoLabel(&FileIcon, Item.m_IsDir ? "\xEF\x81\xBB" : "\xEF\x80\x88", 12.0f, TEXTALIGN_LEFT);
TextRender()->TextColor(TextRender()->DefaultTextColor()); TextRender()->TextColor(TextRender()->DefaultTextColor());
TextRender()->SetCurFont(nullptr); TextRender()->SetCurFont(nullptr);

29
src/game/editor/editor.cpp
View file

@ -4328,26 +4328,27 @@ void CEditor::AddFileDialogEntry(int Index, CUIRect *pView)
Button.VSplitLeft(Button.h, &FileIcon, &Button); Button.VSplitLeft(Button.h, &FileIcon, &Button);
Button.VSplitLeft(5.0f, nullptr, &Button); Button.VSplitLeft(5.0f, nullptr, &Button);
const char* pIconType; const char *pIconType;
if(!m_vFileList[Index].m_IsDir) if(!m_vFileList[Index].m_IsDir)
{ {
switch(m_FileDialogFileType) switch(m_FileDialogFileType)
{ {
case FILETYPE_MAP : case FILETYPE_MAP:
pIconType = "\xEF\x89\xB9"; pIconType = "\xEF\x89\xB9";
break; break;
case FILETYPE_IMG : case FILETYPE_IMG:
pIconType = "\xEF\x80\xBE"; pIconType = "\xEF\x80\xBE";
break; break;
case FILETYPE_SOUND : case FILETYPE_SOUND:
pIconType = "\xEF\x80\x81"; pIconType = "\xEF\x80\x81";
break; break;
default : default:
pIconType = "\xEF\x81\xBB"; pIconType = "\xEF\x81\xBB";
} }
} else { }
else
{
pIconType = "\xEF\x81\xBB"; pIconType = "\xEF\x81\xBB";
} }