TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 06:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Updates the BaseGame UI theme to be more legible and visually consistent.

Browse source 
Also standardizes and fixes the menuInputButtons system.
This commit is contained in:
Areloch 2020-07-23 00:22:15 -05:00
parent ba1eb59e9f
commit 37420cda66
26 changed files with 1163 additions and 643 deletions
Download patch file Download diff file Expand all files Collapse all files

63
Templates/BaseGame/game/data/ui/scripts/messageBoxes.cs
View file

@ -44,9 +44,6 @@ new SFXProfile(messageBoxBeep)
//---------------------------------------------------------------------------------------------
function messageCallback(%dlg, %callback)
{
MessageBoxDlg.originalMenubuttonContainer.add(GamepadButtonsGui);
MessageBoxDlg.originalMenubuttonContainer.refresh();
Canvas.popDialog(%dlg);
eval(%callback);
}
@ -85,6 +82,10 @@ function MBSetText(%text, %frame, %msg)
//sfxPlayOnce( messageBoxBeep );
}
function MessageBoxCtrl::onWake(%this)
{
}
//---------------------------------------------------------------------------------------------
// Various message box display functions. Each one takes a window title, a message, and a
// callback for each button.
@ -96,12 +97,15 @@ function MessageBoxOK(%title, %message, %callback)
Canvas.pushDialog(MessageBoxDlg);
MessageBoxTitleText.text = %title;
MessageBoxDlg.originalMenubuttonContainer = GamepadButtonsGui.getParent();
MessageBoxButtonHolder-->OKButton.set("A", "Enter", "OK", "MessageCallback(MessageBoxDlg,MessageBoxDlg.callback);");
MessageBoxButtonHolder.add(GamepadButtonsGui);
GamepadButtonsGui.clearButtons();
GamepadButtonsGui.setButton(7, "A", "", "OK", "MessageCallback(MessageBoxDlg,MessageBoxDlg.callback);");
GamepadButtonsGui.refreshButtons();
MessageBoxButtonHolder.setActive();
MessageBoxButtonHolder-->oc_OKButton.hidden = true;
MessageBoxButtonHolder-->oc_CancelButton.hidden = true;
MessageBoxButtonHolder-->ync_yesButton.hidden = true;
MessageBoxButtonHolder-->ync_noButton.hidden = true;
MessageBoxButtonHolder-->ync_CancelButton.hidden = true;
MBSetText(MessageBoxText, MessageBoxCtrl, %message);
MessageBoxDlg.callback = %callback;
@ -117,13 +121,15 @@ function MessageBoxOKCancel(%title, %message, %callback, %cancelCallback)
Canvas.pushDialog(MessageBoxDlg);
MessageBoxTitleText.text = %title;
MessageBoxDlg.originalMenubuttonContainer = GamepadButtonsGui.getParent();
MessageBoxButtonHolder-->oc_OKButton.set("A", "Enter", "OK", "MessageCallback(MessageBoxDlg,MessageBoxDlg.callback);");
MessageBoxButtonHolder-->oc_CancelButton.set("B", "Esc", "Cancel", "MessageCallback(MessageBoxDlg,MessageBoxDlg.cancelCallback);");
MessageBoxButtonHolder.setActive();
MessageBoxButtonHolder.add(GamepadButtonsGui);
GamepadButtonsGui.clearButtons();
GamepadButtonsGui.setButton(5, "A", "", "OK", "MessageCallback(MessageBoxDlg,MessageBoxDlg.callback);");
GamepadButtonsGui.setButton(6, "B", "", "Cancel", "MessageCallback(MessageBoxDlg,MessageBoxDlg.cancelCallback);");
GamepadButtonsGui.refreshButtons();
MessageBoxButtonHolder-->OKButton.hidden = true;
MessageBoxButtonHolder-->ync_yesButton.hidden = true;
MessageBoxButtonHolder-->ync_noButton.hidden = true;
MessageBoxButtonHolder-->ync_CancelButton.hidden = true;
MBSetText(MessageBoxText, MessageBoxCtrl, %message);
MessageBoxDlg.callback = %callback;
@ -211,13 +217,15 @@ function MessageBoxYesNo(%title, %message, %yesCallback, %noCallback)
Canvas.pushDialog(MessageBoxDlg);
MessageBoxTitleText.text = %title;
MessageBoxDlg.originalMenubuttonContainer = GamepadButtonsGui.getParent();
MessageBoxButtonHolder-->oc_OKButton.set("A", "Enter", "Yes", "MessageCallback(MessageBoxDlg,MessageBoxDlg.yesCallBack);");
MessageBoxButtonHolder-->oc_CancelButton.set("B", "Esc", "No", "MessageCallback(MessageBoxDlg,MessageBoxDlg.noCallback);");
MessageBoxButtonHolder.add(GamepadButtonsGui);
GamepadButtonsGui.clearButtons();
GamepadButtonsGui.setButton(5, "A", "", "Yes", "MessageCallback(MessageBoxDlg,MessageBoxDlg.yesCallBack);");
GamepadButtonsGui.setButton(6, "B", "", "No", "MessageCallback(MessageBoxDlg,MessageBoxDlg.noCallback);");
GamepadButtonsGui.refreshButtons();
MessageBoxButtonHolder.setActive();
MessageBoxButtonHolder-->OKButton.hidden = true;
MessageBoxButtonHolder-->ync_yesButton.hidden = true;
MessageBoxButtonHolder-->ync_noButton.hidden = true;
MessageBoxButtonHolder-->ync_CancelButton.hidden = true;
MBSetText(MessageBoxText, MessageBoxCtrl, %message);
MessageBoxDlg.yesCallBack = %yesCallback;
@ -229,14 +237,15 @@ function MessageBoxYesNoCancel(%title, %message, %yesCallback, %noCallback, %can
Canvas.pushDialog(MessageBoxDlg);
MessageBoxTitleText.text = %title;
MessageBoxDlg.originalMenubuttonContainer = GamepadButtonsGui.getParent();
MessageBoxButtonHolder-->ync_yesButton.set("A", "Enter", "Yes", "MessageCallback(MessageBoxDlg,MessageBoxDlg.yesCallBack);");
MessageBoxButtonHolder-->ync_noButton.set("X", "Backspace", "No", "MessageCallback(MessageBoxDlg,MessageBoxDlg.noCallback);");
MessageBoxButtonHolder-->ync_cancelButton.set("B", "Esc", "No", "MessageCallback(MessageBoxDlg,MessageBoxDlg.cancelCallback);");
MessageBoxButtonHolder.add(GamepadButtonsGui);
GamepadButtonsGui.clearButtons();
GamepadButtonsGui.setButton(5, "A", "", "Yes", "MessageCallback(MessageBoxDlg,MessageBoxDlg.yesCallBack);");
GamepadButtonsGui.setButton(6, "B", "", "No", "MessageCallback(MessageBoxDlg,MessageBoxDlg.noCallback);");
GamepadButtonsGui.setButton(7, "Back", "", "Cancel", "MessageCallback(MessageBoxDlg,MessageBoxDlg.cancelCallback);");
GamepadButtonsGui.refreshButtons();
MessageBoxButtonHolder.setActive();
MessageBoxButtonHolder-->OKButton.hidden = true;
MessageBoxButtonHolder-->oc_OKButton.hidden = true;
MessageBoxButtonHolder-->oc_CancelButton.hidden = true;
MBSetText(MessageBoxText, MessageBoxCtrl, %message);
MessageBoxDlg.yesCallBack = %yesCallback;