Merge pull request #1197 from Areloch/UpdateBaseUILoadingScreen

Updates the loadingGUI to utilize the same panels for the background coloration that the other new menus use, rather than a bitmap.
This commit is contained in:
Brian Roberts 2024-02-04 00:12:01 -06:00 committed by GitHub
commit 1ee85334b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1,10 +1,9 @@
//--- OBJECT WRITE BEGIN --- //--- OBJECT WRITE BEGIN ---
$guiContent = new GuiChunkedBitmapCtrl(LoadingGui) { $guiContent = new GuiControl(LoadingGui) {
bitmapAsset = "UI:backgrounddark_image";
useVariable = "0"; useVariable = "0";
tile = "0"; tile = "0";
position = "0 0"; position = "0 0";
extent = "1024 768"; extent = "1280 720";
minExtent = "8 8"; minExtent = "8 8";
horizSizing = "width"; horizSizing = "width";
vertSizing = "height"; vertSizing = "height";
@ -18,13 +17,21 @@ $guiContent = new GuiChunkedBitmapCtrl(LoadingGui) {
canSaveDynamicFields = "1"; canSaveDynamicFields = "1";
Enabled = "1"; Enabled = "1";
new GuiPanel() {
position = "0 0";
extent = "1280 720";
horizSizing = "width";
vertSizing = "height";
profile = "GuiMenuPanelProfile";
tooltipProfile = "GuiToolTipProfile";
new GuiControl() { new GuiControl() {
position = "263 301"; position = "263 301";
extent = "360 360"; extent = "360 360";
minExtent = "8 8"; minExtent = "8 8";
horizSizing = "center"; horizSizing = "center";
vertSizing = "center"; vertSizing = "center";
profile = "GuiDefaultProfile"; profile = "GuiMenuPanelProfile";
visible = "1"; visible = "1";
active = "1"; active = "1";
command = "disconnect();\nCanvas.setContent(ProjectSettings.value(\"UI/mainMenuName\"));"; command = "disconnect();\nCanvas.setContent(ProjectSettings.value(\"UI/mainMenuName\"));";
@ -35,24 +42,6 @@ $guiContent = new GuiChunkedBitmapCtrl(LoadingGui) {
canSave = "1"; canSave = "1";
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
new GuiBitmapCtrl() {
bitmapAsset = "UI:backgrounddark_image";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "360 360";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiBitmapCtrl(LoadingLogo) { new GuiBitmapCtrl(LoadingLogo) {
bitmapAsset = "UI:Torque_3D_logo_alt_image"; bitmapAsset = "UI:Torque_3D_logo_alt_image";
color = "255 255 255 255"; color = "255 255 255 255";
@ -117,5 +106,6 @@ $guiContent = new GuiChunkedBitmapCtrl(LoadingGui) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
}; };
}; };
};
}; };
//--- OBJECT WRITE END --- //--- OBJECT WRITE END ---