t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expand the intro window so nothing is cut off

Browse Source
This commit is contained in:
Loporrit
2023-09-01 05:25:29 +00:00
parent e0ae62ff0d
commit d18dc744c5
2 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MareSynchronos/UI/IntroUI.cs
View File

@@ -42,8 +42,8 @@ public class IntroUi : WindowMediatorSubscriberBase
SizeConstraints = new WindowSizeConstraints()
{
MinimumSize = new Vector2(600, 400),
MaximumSize = new Vector2(600, 2000),
MinimumSize = new Vector2(650, 400),
MaximumSize = new Vector2(650, 2000),
};
GetToSLocalization();
@@ -71,7 +71,7 @@ public class IntroUi : WindowMediatorSubscriberBase
UiSharedService.ColorTextWrapped("Note: Any modifications you have applied through anything but Penumbra cannot be shared and your character state on other clients " +
"might look broken because of this or others players mods might not apply on your end altogether. " +
"If you want to use this plugin you will have to move your mods to Penumbra.", ImGuiColors.DalamudYellow);
if (!_uiShared.DrawOtherPluginState()) return;
if (!_uiShared.DrawOtherPluginState(true)) return;
ImGui.Separator();
if (ImGui.Button("Next##toAgreement"))
{
@@ -193,15 +193,7 @@ public class IntroUi : WindowMediatorSubscriberBase
if (_uiShared.UidFontBuilt) ImGui.PopFont();
ImGui.Separator();
UiSharedService.TextWrapped("To be able to use Loporrit you will have to register an account.");
UiSharedService.TextWrapped("For the official Mare Synchronos Servers the account creation will be handled on the official Mare Synchronos Discord. Due to security risks for the server, there is no way to handle this senisibly otherwise.");
UiSharedService.TextWrapped("If you want to register at the main server \"" + WebAPI.ApiController.MainServer + "\" join the Discord and follow the instructions as described in #mare-commands.");
if (ImGui.Button("Join the Mare Synchronos Discord"))
{
Util.OpenLink("https://discord.gg/mpNdkrTRjW");
}
UiSharedService.TextWrapped("For all other non official services you will have to contact the appropriate service provider how to obtain a secret key.");
UiSharedService.TextWrapped("Refer to the instructions at the location you obtained this plugin for more information or support.");
ImGui.Separator();

33
MareSynchronos/UI/UISharedService.cs
View File

@@ -705,7 +705,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
}
}
public bool DrawOtherPluginState()
public bool DrawOtherPluginState(bool intro = false)
{
var penumbraColor = _penumbraExists ? ImGuiColors.ParsedGreen : ImGuiColors.DalamudRed;
var glamourerColor = _glamourerExists ? ImGuiColors.ParsedGreen : ImGuiColors.DalamudRed;
@@ -715,9 +715,19 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
var honorificColor = _honorificExists ? ImGuiColors.ParsedGreen : ImGuiColors.DalamudRed;
var check = FontAwesomeIcon.Check.ToIconString();
var cross = FontAwesomeIcon.SquareXmark.ToIconString();
ImGui.TextUnformatted("Mandatory Plugins:");
ImGui.SameLine();
if (intro)
{
ImGui.SetWindowFontScale(0.8f);
BigText("Mandatory Plugins");
ImGui.SetWindowFontScale(1.0f);
}
else
{
ImGui.TextUnformatted("Mandatory Plugins:");
ImGui.SameLine();
}
ImGui.TextUnformatted("Penumbra");
ImGui.SameLine();
FontText(_penumbraExists ? check : cross, UiBuilder.IconFont, penumbraColor);
@@ -733,8 +743,19 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
AttachToolTip($"Glamourer is " + (_glamourerExists ? "available and up to date." : "unavailable or not up to date."));
ImGui.Spacing();
ImGui.TextUnformatted("Optional Plugins:");
ImGui.SameLine();
if (intro)
{
ImGui.SetWindowFontScale(0.8f);
BigText("Optional Addons");
ImGui.SetWindowFontScale(1.0f);
UiSharedService.TextWrapped("These addons are not required for basic operation, but without them you may not see others as intended.");
}
else
{
ImGui.TextUnformatted("Optional Addons:");
ImGui.SameLine();
}
ImGui.TextUnformatted("SimpleHeels");
ImGui.SameLine();
FontText(_heelsExists ? check : cross, UiBuilder.IconFont, heelsColor);
@@ -934,4 +955,4 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
Logger.LogDebug("Font doesn't exist. {fontFile}", fontFile);
}
}
}
}