about summary refs log tree commit diff
path: root/src/game
diff options
context:
space:
mode:
authorFujnky <larsfunke1996@gmail.com>2010-06-05 18:50:26 +0200
committerFujnky <larsfunke1996@gmail.com>2010-06-05 18:50:26 +0200
commitd000766e9dc82b1632c2f7d826c68df15f8afd26 (patch)
tree20cc4882735f9b78eedfeaec2a16d90f2151ac9c /src/game
parent82a30b7b7ee55d6138b06ce0f35502be5bd27e23 (diff)
parent3d079a35e9f058ee80c39c9ac204c57e042aad6e (diff)
downloadzcatch-d000766e9dc82b1632c2f7d826c68df15f8afd26.tar.gz
zcatch-d000766e9dc82b1632c2f7d826c68df15f8afd26.zip
Merge branch 'master' of git://github.com/matricks/teeworlds
Diffstat (limited to 'src/game')
-rw-r--r--src/game/client/components/menus_browser.cpp5
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