Merge 8aa8c4ee01 into 0f12044fcd

Fix scrollbar rail clicking being active while popups open

src/engine/client/serverbrowser_http.cpp

@@ -424,7 +424,10 @@ void CServerBrowserHttp::Refresh()
 }
 bool ServerbrowserParseUrl(NETADDR *pOut, const char *pUrl)
 {
-	return net_addr_from_url(pOut, pUrl, nullptr, 0) != 0;
+	int Failure = net_addr_from_url(pOut, pUrl, nullptr, 0);
+	if(Failure || pOut->port == 0)
+		return true;
+	return false;
 }
 bool CServerBrowserHttp::Validate(json_value *pJson)
 {

src/game/client/components/nameplates.cpp

@@ -172,10 +172,12 @@ void CNamePlates::RenderNameplate(vec2 Position, const CNetObj_PlayerInfo *pPlay
 
 		if(g_Config.m_ClNameplatesClan)
 		{
-			YOffset -= FontSizeClan;
 			if(NamePlate.m_ClanTextContainerIndex.Valid())
+			{
+				YOffset -= FontSizeClan;
 				TextRender()->RenderTextContainer(NamePlate.m_ClanTextContainerIndex, TColor, TOutlineColor, Position.x - TextRender()->GetBoundingBoxTextContainer(NamePlate.m_ClanTextContainerIndex).m_W / 2.0f, YOffset);
 			}
+		}
 
 		if(g_Config.m_ClNameplatesFriendMark && ClientData.m_Friend)
 		{

src/game/client/ui.cpp

@@ -1300,6 +1300,8 @@ float CUi::DoScrollbarV(const void *pId, const CUIRect *pRect, float Current)
 		}
 	}
 	else if(HotItem() == pId)
+	{
+		if(InsideHandle)
 		{
 			if(MouseButton(0))
 			{
@@ -1308,14 +1310,15 @@ float CUi::DoScrollbarV(const void *pId, const CUIRect *pRect, float Current)
 				Grabbed = true;
 			}
 		}
-	else if(MouseButtonClicked(0) && !InsideHandle && InsideRail)
+		else if(MouseButtonClicked(0))
 		{
 			SetActiveItem(pId);
 			m_ActiveScrollbarOffset = Handle.h / 2.0f;
 			Grabbed = true;
 		}
+	}
 
-	if(InsideHandle && !MouseButton(0))
+	if(InsideRail && !MouseButton(0))
 	{
 		SetHotItem(pId);
 	}
@@ -1379,6 +1382,8 @@ float CUi::DoScrollbarH(const void *pId, const CUIRect *pRect, float Current, co
 		}
 	}
 	else if(HotItem() == pId)
+	{
+		if(InsideHandle)
 		{
 			if(MouseButton(0))
 			{
@@ -1387,12 +1392,13 @@ float CUi::DoScrollbarH(const void *pId, const CUIRect *pRect, float Current, co
 				Grabbed = true;
 			}
 		}
-	else if(MouseButtonClicked(0) && !InsideHandle && InsideRail)
+		else if(MouseButtonClicked(0))
 		{
 			SetActiveItem(pId);
 			m_ActiveScrollbarOffset = Handle.w / 2.0f;
 			Grabbed = true;
 		}
+	}
 
 	if(!pColorInner && (InsideHandle || Grabbed) && (CheckActiveItem(pId) || HotItem() == pId))
 	{
@@ -1400,7 +1406,7 @@ float CUi::DoScrollbarH(const void *pId, const CUIRect *pRect, float Current, co
 		Handle.y -= 1.5f;
 	}
 
-	if(InsideHandle && !MouseButton(0))
+	if(InsideRail && !MouseButton(0))
 	{
 		SetHotItem(pId);
 	}