Merge pull request #849 from AntlerForce/master

Ensure all occurrences of userControl:SetPos have enough height to actually display the user
beyond-all-reason · Dec 10, 2024 · f4b3fdf · f4b3fdf
2 parents af4a816 + df6e507
commit f4b3fdf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/LuaMenu/widgets/chobby/components/friend_list_window.lua b/LuaMenu/widgets/chobby/components/friend_list_window.lua
@@ -104,7 +104,7 @@ function FriendListWindow:OnAddUser(userName)
 		end
 		if WG.Chobby.Configuration:AllowNotification(userName) then
 			local userControl = WG.UserHandler.GetNotificationUser(userName)
-			userControl:SetPos(30, 30, 250, 20)
+			userControl:SetPos(30, 30, 250, 80)
 			Chotify:Post({
 				title = i18n("user_online"),
 				body  = userControl,
@@ -130,7 +130,7 @@ function FriendListWindow:OnRemoveUser(userName)
 	end
 	if userInfo.isFriend and WG.Chobby.Configuration:AllowNotification(userName) then
 		local userControl = WG.UserHandler.GetNotificationUser(userName)
-		userControl:SetPos(30, 30, 250, 20)
+		userControl:SetPos(30, 30, 250, 80)
 		Chotify:Post({
 			title = i18n("user_offline"),
 			body  = userControl,
@@ -218,7 +218,7 @@ end
 function FriendListWindow:OnNewFriendRequestByID(userID, userName)
 	if WG.Chobby.Configuration:AllowNotification() then
 		local userControl = WG.UserHandler.GetNotificationUser(userName)
-		userControl:SetPos(20, 40, 250, 20)
+		userControl:SetPos(20, 40, 250, 80)
 		Chotify:Post({
 			title = i18n("friend_request_new"),
 			body  = userControl,
@@ -229,7 +229,7 @@ end
 function FriendListWindow:OnFriendRequestAcceptedByID(userID, userName)
 	if WG.Chobby.Configuration:AllowNotification() then
 		local userControl = WG.UserHandler.GetNotificationUser(userName)
-		userControl:SetPos(20, 40, 250, 20)
+		userControl:SetPos(20, 40, 250, 80)
 		Chotify:Post({
 			title = i18n("friend_request_accepted"),
 			body  = userControl,

diff --git a/LuaMenu/widgets/gui_battle_room_window.lua b/LuaMenu/widgets/gui_battle_room_window.lua
@@ -1494,7 +1494,7 @@ local function SetupInfoButtonsPanel(leftInfo, rightInfo, battle, battleID, myUs
 					Spring.PlaySoundFile("sounds/Alarm_light5_mixdown.wav", WG.Chobby.Configuration.menuNotificationVolume or 1) -- RING SOUND
 
 					local userControl = WG.UserHandler.GetNotificationUser(mynewbestfriend)
-					userControl:SetPos(30, 30, 250, 20)
+					userControl:SetPos(30, 30, 250, 80)
 					Chotify:Post({
 						title = i18n("A Player Joined You"),
 						body = userControl,
@@ -3740,7 +3740,7 @@ local function InitializeControls(battleID, oldLobby, topPoportion, setupData)
 		local userInfo = lobby:TryGetUser(userName)
 		if userInfo then
 			local userControl = WG.UserHandler.GetNotificationUser(userName)
-			userControl:SetPos(30, 30, 250, 20)
+			userControl:SetPos(30, 30, 250, 80)
 			Chotify:Post({
 				title = "User Rang You", --i18n("User Rang You"),
 				body = userControl,