diff options
| author | xalduin <xalduin@gmail.com> | 2010-06-04 12:01:37 -0400 |
|---|---|---|
| committer | xalduin <xalduin@gmail.com> | 2010-06-04 12:01:37 -0400 |
| commit | ab0d8d0eb84469fa456ef6d56be2147cbba771da (patch) | |
| tree | 4e4581c5f57d2e191fcd6166944248c344ae4edf /src/game | |
| parent | 1f41e7da8589c80ba8b3e87d2e5bd549464c0d53 (diff) | |
| parent | 3d079a35e9f058ee80c39c9ac204c57e042aad6e (diff) | |
| download | zcatch-ab0d8d0eb84469fa456ef6d56be2147cbba771da.tar.gz zcatch-ab0d8d0eb84469fa456ef6d56be2147cbba771da.zip | |
Merge remote branch 'upstream/master'
* upstream/master: fixed bug with the quick search box. Closes #89
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/client/components/menus_browser.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp index 8d9b11cf..9b816f15 100644 --- a/src/game/client/components/menus_browser.cpp +++ b/src/game/client/components/menus_browser.cpp @@ -357,9 +357,10 @@ void CMenus::RenderServerbrowserServerList(CUIRect View) Status.VSplitLeft(260.0f, &QuickSearch, &Status); const char *pLabel = Localize("Quick search:"); UI()->DoLabel(&QuickSearch, pLabel, 12.0f, -1); - QuickSearch.VSplitLeft(TextRender()->TextWidth(0, 12.0f, pLabel, -1), 0, &QuickSearch); + float w = TextRender()->TextWidth(0, 12.0f, pLabel, -1); + QuickSearch.VSplitLeft(w, 0, &QuickSearch); QuickSearch.VSplitLeft(5.0f, 0, &QuickSearch); - QuickSearch.VSplitLeft(155.0f, &QuickSearch, &Button); + QuickSearch.VSplitLeft(260.0f-w-22.0f, &QuickSearch, &Button); static float Offset = 0.0f; DoEditBox(&g_Config.m_BrFilterString, &QuickSearch, g_Config.m_BrFilterString, sizeof(g_Config.m_BrFilterString), 12.0f, &Offset, false, CUI::CORNER_L); // clear button |