Skip to content

Ready button fixes 3 #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Beherith merged 2 commits into from
Jul 1, 2022
Merged

Ready button fixes 3 #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5466fd
Ready button default to unready; dec font size for ready & start buttons
MasterBel2 Jun 26, 2022
806eb6d
Update Play / Spectating button styling
MasterBel2 Jun 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions LuaMenu/widgets/chili/skins/Evolved/skin.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ skin.button_highlight = {
tiles = {32, 32, 32, 32}, --// tile widths: left,top,right,bottom
padding = {20, 20, 20, 20},

backgroundColor = {0.2, 0.2, 0.2, 0.7},
focusColor = {0.375, 0.375, 0.375, 0.5},
borderColor = {1,1,1,0},
backgroundColor = {0.70, 0.70, 0.75, 0.65},
focusColor = {0.72, 0.72, 0.80, 0.9},
borderColor = {0.40, 0.40, 0.50, 0.15},

DrawControl = DrawButton,
}
Expand Down
9 changes: 8 additions & 1 deletion LuaMenu/widgets/chobby/i18n/chililobby.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,20 @@ return {
skip_tutorial = "Skip Tutorial",
rejoin = "Rejoin",
abandon = "Abandon",

tooltip_is_spectator = "You will spectate this game",
tooltip_become_spectator = "Press to watch the game as a spectator",
spectate = "Spectate",
spectating = "Spectating",

tooltip_is_player = "You will play in this game",
tooltip_become_player = "Press to play in this game",
play = "Play",
playing = "Playing",

watch = "Watch",
matchmaking = "Matchmaking",
customGames = "Custom Games",
playing = "Playing",
pick_map = "Change Map",
add_team = "Add Team",
players = "Players",
Expand Down
83 changes: 53 additions & 30 deletions LuaMenu/widgets/gui_battle_room_window.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,10 +699,11 @@ local function SetupInfoButtonsPanel(leftInfo, rightInfo, battle, battleID, myUs
bottom = 0,
height = 48,
classname = "ready_button",
font = config:GetFont(4),
disabledFont = config:GetFont(4),
font = config:GetFont(3),
disabledFont = config:GetFont(3),
hasDisabledFont = true,
tooltip = "", -- Set in OnUpdateUserBattleStatus
caption = i18n("unready"),
tooltip = i18n("unready_tooltip"), -- Set in OnUpdateUserBattleStatus
OnClick = {
function(readyButton)
if not readyButton.state.enabled then return end
Expand All @@ -713,6 +714,7 @@ local function SetupInfoButtonsPanel(leftInfo, rightInfo, battle, battleID, myUs
parent = rightInfo,
}
readyButton:SetEnabled(false)
readyButton:StyleUnready()
end

btnStartBattle = Button:New {
Expand All @@ -722,7 +724,7 @@ local function SetupInfoButtonsPanel(leftInfo, rightInfo, battle, battleID, myUs
height = 48,
caption = i18n("start"),
classname = "action_button",
font = config:GetFont(4),
font = config:GetFont(3),
tooltip = "Start the game, or call a vote to start multiplayer, or join a running game",
OnClick = {
function()
Expand Down Expand Up @@ -758,41 +760,67 @@ local function SetupInfoButtonsPanel(leftInfo, rightInfo, battle, battleID, myUs
}

local btnPlay
local btnSpectate = Button:New {
local btnSpectate

local function SetButtonStatePlaying()
ButtonUtilities.SetButtonDeselected(btnSpectate)
ButtonUtilities.SetCaption(btnSpectate, i18n("spectate"))
ButtonUtilities.SetButtonSelected(btnPlay)
ButtonUtilities.SetCaption(btnPlay, i18n("playing"))

btnPlay.suppressButtonReaction = true
btnSpectate.suppressButtonReaction = false

btnPlay.tooltip = i18n("tooltip_is_player")
btnSpectate.tooltip = i18n("tooltip_become_spectator")

end
local function SetButtonStateSpectating()
ButtonUtilities.SetButtonDeselected(btnPlay)
ButtonUtilities.SetCaption(btnPlay, i18n("play"))
ButtonUtilities.SetButtonSelected(btnSpectate)

btnSpectate.suppressButtonReaction = true
btnPlay.suppressButtonReaction = false

btnSpectate.tooltip = i18n("tooltip_is_spectator")
btnPlay.tooltip = i18n("tooltip_become_player")

ButtonUtilities.SetCaption(btnSpectate, i18n("spectating"))
end

btnSpectate = Button:New { -- Some properties set by SetButtonStatePlaying() after both buttons are initialised.
x = "50.5%",
right = 0,
bottom = 51,
height = 48,
height = 32,
classname = "button_highlight",
caption = "\255\66\138\201" .. i18n("spectator") .. "\b",
font = config:GetFont(3),
tooltip = "Watch the game as a spectator",
caption = "",
font = config:GetFont(2),
OnClick = {
function(obj)
battleLobby:SetBattleStatus({
isSpectator = true,
isReady = false
})
ButtonUtilities.SetButtonDeselected(btnPlay)
ButtonUtilities.SetCaption(btnPlay, i18n("play"))
ButtonUtilities.SetButtonSelected(obj)
ButtonUtilities.SetCaption(obj, i18n("spectating"))

SetButtonStateSpectating()

WG.Analytics.SendOnetimeEvent("lobby:multiplayer:custom:spectate")
WG.Chobby.Configuration:SetConfigValue("lastGameSpectatorState", true)
end
},
parent = rightInfo,
}

btnPlay = Button:New {
btnPlay = Button:New { -- Some properties set by SetButtonStatePlaying() after both buttons are initialised.
x = 0,
right = "50.5%",
bottom = 51,
height = 48,
height = 32,
classname = "button_highlight",
caption = "\255\66\138\201" .. i18n("player") .. "\b",
font = config:GetFont(3),
tooltip = "Become a player in this game",
caption = "",
font = config:GetFont(2),
OnClick = {
function(obj)
local unusedTeamID = battleLobby:GetUnusedTeamID()
Expand All @@ -802,17 +830,18 @@ local function SetupInfoButtonsPanel(leftInfo, rightInfo, battle, battleID, myUs
isReady = false,
side = (WG.Chobby.Configuration.lastFactionChoice or 0),
teamNumber = unusedTeamID})
ButtonUtilities.SetButtonDeselected(btnSpectate)
ButtonUtilities.SetCaption(btnSpectate, i18n("spectate"))
ButtonUtilities.SetButtonSelected(obj)
ButtonUtilities.SetCaption(obj, i18n("playing"))

SetButtonStatePlaying()

WG.Analytics.SendOnetimeEvent("lobby:multiplayer:custom:play")
WG.Chobby.Configuration:SetConfigValue("lastGameSpectatorState", false)
end
},
parent = rightInfo,
}

SetButtonStatePlaying()

rightInfo.OnResize = {
function (obj, xSize, ySize)
if xSize + minimapBottomClearance < ySize then
Expand Down Expand Up @@ -1063,17 +1092,11 @@ local function SetupInfoButtonsPanel(leftInfo, rightInfo, battle, battleID, myUs
function externalFunctions.UpdateUserTeamStatus(userName, allyNumber, isSpectator)
if userName == myUserName then
if isSpectator then
ButtonUtilities.SetButtonDeselected(btnPlay)
ButtonUtilities.SetCaption(btnPlay, i18n("play"))
ButtonUtilities.SetButtonSelected(btnSpectate)
ButtonUtilities.SetCaption(btnSpectate, i18n("spectating"))
SetButtonStateSpectating()
startBoxPanel:Hide()
minimapPanel.disableChildrenHitTest = true --omg this is amazing
else
ButtonUtilities.SetButtonDeselected(btnSpectate)
ButtonUtilities.SetCaption(btnSpectate, i18n("spectate"))
ButtonUtilities.SetButtonSelected(btnPlay)
ButtonUtilities.SetCaption(btnPlay, i18n("playing"))
SetButtonStatePlaying()
startBoxPanel:Show()
minimapPanel.disableChildrenHitTest = false
end
Expand Down