* Fix flicker in server list when switching servers. (#108)

* Fix a bug where the scroll area of the server list is too large.
DiscordMessenger · Jun 13, 2024 · ae848eb · ae848eb
1 parent 62906f7
commit ae848eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/discord/DiscordInstance.cpp b/src/discord/DiscordInstance.cpp
@@ -671,13 +671,14 @@ void DiscordInstance::HandleRequest(NetRequest* pRequest)
 
 				m_CurrentChannel = 0;
 
+				GetFrontend()->RepaintGuildList();
+
 				// select the first one, if possible
 				Snowflake guildsf = 0;
 				if (m_guilds.size() > 0)
 					guildsf = m_guilds.front().m_snowflake;
 
 				OnSelectGuild(guildsf);
-
 				break;
 			}
 			case GUILD:
@@ -2093,6 +2094,7 @@ void DiscordInstance::HandleREADY(Json& j)
 		guildsf = m_CurrentGuild;
 	}
 
+	GetFrontend()->RepaintGuildList();
 	OnSelectGuild(guildsf);
 
 	// Doing this because the contents of all channels might be outdated.

diff --git a/src/windows/GuildLister.cpp b/src/windows/GuildLister.cpp
@@ -163,13 +163,13 @@ void GuildLister::UpdateSelected()
 
 	auto it = m_iconRects.find(m_selectedGuild);
 	if (it != m_iconRects.end()) {
-		InvalidateRect(m_hwnd, NULL, TRUE);
+		InvalidateRect(m_hwnd, &it->second, FALSE);
 	}
 
 	m_selectedGuild = GetDiscordInstance()->GetCurrentGuildID();
 	it = m_iconRects.find(m_selectedGuild);
 	if (it != m_iconRects.end()) {
-		InvalidateRect(m_hwnd, NULL, TRUE);
+		InvalidateRect(m_hwnd, &it->second, FALSE);
 	}
 }
 
@@ -520,8 +520,8 @@ int GuildLister::GetScrollableHeight()
 	std::vector<Snowflake> sf;
 	GetDiscordInstance()->GetGuildIDs(sf, true);
 	//take out gap
-	int pfpSize = ScaleByDPI(PROFILE_PICTURE_SIZE_DEF + 12) + BORDER_SIZE * 2;
-	return sf.size() * pfpSize - (pfpSize - C_GUILD_GAP_HEIGHT);
+	int pfpSize = ScaleByDPI(PROFILE_PICTURE_SIZE_DEF + 12);
+	return sf.size() * pfpSize - pfpSize + C_GUILD_GAP_HEIGHT;
 }
 
 std::string MakeIconStringFromName(const std::string& name)