Fix controls rectangle overlapping topbar and being clickable outside…

… of scope
ddnet · Jul 22, 2017 · d50b39c · d50b39c
1 parent 9b582cf
commit d50b39c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/ddnet-libs b/ddnet-libs
diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
@@ -1009,16 +1009,13 @@ int CMenus::Render()
 
 	if(m_Popup == POPUP_NONE)
 	{
-		// do tab bar
 #if defined(__ANDROID__)
 		Screen.HSplitTop(100.0f, &TabBar, &MainView);
 #else
 		Screen.HSplitTop(24.0f, &TabBar, &MainView);
 #endif
-		TabBar.VMargin(20.0f, &TabBar);
-		RenderMenubar(TabBar);
 
-		// news is not implemented yet
+		// render news
 		if(g_Config.m_UiPage < PAGE_NEWS || g_Config.m_UiPage > PAGE_SETTINGS || (Client()->State() == IClient::STATE_OFFLINE && g_Config.m_UiPage >= PAGE_GAME && g_Config.m_UiPage <= PAGE_CALLVOTE))
 		{
 			ServerBrowser()->Refresh(IServerBrowser::TYPE_INTERNET);
@@ -1060,6 +1057,10 @@ int CMenus::Render()
 			RenderServerbrowser(MainView);
 		else if(g_Config.m_UiPage == PAGE_SETTINGS)
 			RenderSettings(MainView);
+
+		// do tab bar
+		TabBar.VMargin(20.0f, &TabBar);
+		RenderMenubar(TabBar);
 	}
 	else
 	{

diff --git a/src/game/client/components/menus.h b/src/game/client/components/menus.h
@@ -73,7 +73,7 @@ class CMenus : public CComponent
 	int DoKeyReader(void *pID, const CUIRect *pRect, int Key);
 
 	//static int ui_do_key_reader(void *id, const CUIRect *rect, int key);
-	void UiDoGetButtons(int Start, int Stop, CUIRect View);
+	void UiDoGetButtons(int Start, int Stop, CUIRect View, CUIRect ScopeView);
 
 	struct CListboxItem
 	{

diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp
@@ -703,15 +703,18 @@ static CKeyInfo gs_aKeys[] =
 
 const int g_KeyCount = sizeof(gs_aKeys) / sizeof(CKeyInfo);
 
-void CMenus::UiDoGetButtons(int Start, int Stop, CUIRect View)
+void CMenus::UiDoGetButtons(int Start, int Stop, CUIRect View, CUIRect ScopeView)
 {
-	for (int i = Start; i < Stop; i++)
+	for(int i = Start; i < Stop; i++)
 	{
 		CKeyInfo &Key = gs_aKeys[i];
 		CUIRect Button, Label;
 		View.HSplitTop(20.0f, &Button, &View);
 		Button.VSplitLeft(135.0f, &Label, &Button);
 
+		if(Button.y < ScopeView.y || Button.y + Button.h > ScopeView.y + ScopeView.h)
+			continue;
+
 		char aBuf[64];
 		str_format(aBuf, sizeof(aBuf), "%s:", (const char *)Key.m_Name);
 
@@ -783,7 +786,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 			MovementSettings.HSplitTop(20.0f, 0, &MovementSettings);
 		}
 
-		UiDoGetButtons(0, 17, MovementSettings);
+		UiDoGetButtons(0, 17, MovementSettings, MainView);
 
 	}
 
@@ -797,7 +800,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 		TextRender()->Text(0, WeaponSettings.x, WeaponSettings.y, 14.0f*UI()->Scale(), Localize("Weapon"), -1);
 
 		WeaponSettings.HSplitTop(14.0f+5.0f+10.0f, 0, &WeaponSettings);
-		UiDoGetButtons(17, 24, WeaponSettings);
+		UiDoGetButtons(17, 24, WeaponSettings, MainView);
 	}
 
 	// defaults
@@ -823,7 +826,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 		TextRender()->Text(0, VotingSettings.x, VotingSettings.y, 14.0f*UI()->Scale(), Localize("Voting"), -1);
 
 		VotingSettings.HSplitTop(14.0f+5.0f+10.0f, 0, &VotingSettings);
-		UiDoGetButtons(24, 26, VotingSettings);
+		UiDoGetButtons(24, 26, VotingSettings, MainView);
 	}
 
 	// chat settings
@@ -836,7 +839,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 		TextRender()->Text(0, ChatSettings.x, ChatSettings.y, 14.0f*UI()->Scale(), Localize("Chat"), -1);
 
 		ChatSettings.HSplitTop(14.0f+5.0f+10.0f, 0, &ChatSettings);
-		UiDoGetButtons(26, 30, ChatSettings);
+		UiDoGetButtons(26, 30, ChatSettings, MainView);
 	}
 
 	// misc settings
@@ -849,7 +852,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 		TextRender()->Text(0, MiscSettings.x, MiscSettings.y, 14.0f*UI()->Scale(), Localize("Miscellaneous"), -1);
 
 		MiscSettings.HSplitTop(14.0f+5.0f+10.0f, 0, &MiscSettings);
-		UiDoGetButtons(30, 42, MiscSettings);
+		UiDoGetButtons(30, 42, MiscSettings, MainView);
 	}
 
 	UiDoListboxEnd(&s_ScrollValue, 0);