diff options
| author | Damian Kaczmarek <rush@rushbase.net> | 2010-12-14 01:20:47 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-01-05 12:14:36 +0100 |
| commit | 073044747b5a3f172e5b03ab58b373cdd645c087 (patch) | |
| tree | 6c8425d2346f61d5f9bab3a0ae79a1a0281c8d5a /src/game/client/components/menus_ingame.cpp | |
| parent | aad2438882943b23a72cee28c1b71d217883ebf9 (diff) | |
| download | zcatch-073044747b5a3f172e5b03ab58b373cdd645c087.tar.gz zcatch-073044747b5a3f172e5b03ab58b373cdd645c087.zip | |
-Working ui_scale parameter.
(doing it properly would require lots of framework/interface job ...)
Diffstat (limited to 'src/game/client/components/menus_ingame.cpp')
| -rw-r--r-- | src/game/client/components/menus_ingame.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/client/components/menus_ingame.cpp b/src/game/client/components/menus_ingame.cpp index a19961e7..ffb4bdfe 100644 --- a/src/game/client/components/menus_ingame.cpp +++ b/src/game/client/components/menus_ingame.cpp @@ -192,8 +192,8 @@ void CMenus::RenderServerInfo(CUIRect MainView) MainView.Margin(10.0f, &View); // serverinfo - View.HSplitTop(View.h/2-5.0f, &ServerInfo, &Motd); - ServerInfo.VSplitLeft(View.w/2-5.0f, &ServerInfo, &GameInfo); + View.HSplitTop(View.h/2/UI()->Scale()-5.0f, &ServerInfo, &Motd); + ServerInfo.VSplitLeft(View.w/2/UI()->Scale()-5.0f, &ServerInfo, &GameInfo); RenderTools()->DrawUIRect(&ServerInfo, vec4(1,1,1,0.25f), CUI::CORNER_ALL, 10.0f); ServerInfo.Margin(5.0f, &ServerInfo); @@ -299,7 +299,7 @@ void CMenus::RenderServerControlServer(CUIRect MainView) CListboxItem Item = UiDoListboxNextItem(pOption); if(Item.m_Visible) - UI()->DoLabel(&Item.m_Rect, FormatCommand(pOption->m_aCommand), 16.0f, -1); + UI()->DoLabelScaled(&Item.m_Rect, FormatCommand(pOption->m_aCommand), 16.0f, -1); } m_CallvoteSelectedOption = UiDoListboxEnd(&s_ScrollValue, 0); @@ -335,7 +335,7 @@ void CMenus::RenderServerControlKick(CUIRect MainView) Item.m_Rect.HSplitTop(5.0f, 0, &Item.m_Rect); // some margin from the top RenderTools()->RenderTee(CAnimState::GetIdle(), &Info, EMOTE_NORMAL, vec2(1,0), vec2(Item.m_Rect.x+Item.m_Rect.h/2, Item.m_Rect.y+Item.m_Rect.h/2)); Item.m_Rect.x +=Info.m_Size; - UI()->DoLabel(&Item.m_Rect, m_pClient->m_aClients[aPlayerIDs[i]].m_aName, 16.0f, -1); + UI()->DoLabelScaled(&Item.m_Rect, m_pClient->m_aClients[aPlayerIDs[i]].m_aName, 16.0f, -1); } } @@ -422,7 +422,7 @@ void CMenus::RenderServerControl(CUIRect MainView) Bottom.VSplitRight(160.0f, &Bottom, &Reason); Reason.HSplitTop(5.0f, 0, &Reason); const char *pLabel = Localize("Reason:"); - UI()->DoLabel(&Reason, pLabel, 14.0f, -1); + UI()->DoLabelScaled(&Reason, pLabel, 14.0f, -1); float w = TextRender()->TextWidth(0, 14.0f, pLabel, -1); Reason.VSplitLeft(w+10.0f, 0, &Reason); static float s_Offset = 0.0f; |