Skip to content
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

[UI] Fix PvP font scaling to match PvE #204

Merged
merged 2 commits into from
Dec 23, 2024
Merged

[UI] Fix PvP font scaling to match PvE #204

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4653fbf
Make PVP size scaling match PVE's
zbee Dec 15, 2024
3f1436e
Merge remote-tracking branch 'wrath/main' into ui-pvpFeaturesFontScaling
zbee Dec 23, 2024
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
5 changes: 2 additions & 3 deletions WrathCombo/Window/Tabs/PvPFeatures.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ internal class PvPFeatures : ConfigWindow
var id = groupedPresets[OpenJob].First().Info.JobID;
IDalamudTextureWrap? icon = Icons.GetJobIcon(id);

using (var headingTab = ImRaii.Child("PvPHeadingTab", new Vector2(ImGui.GetContentRegionAvail().X, icon is null ? 24f.Scale() : (icon.Size.Y / 2f.Scale()) + 4f)))
using (var headingTab = ImRaii.Child("PvPHeadingTab", new Vector2(ImGui.GetContentRegionAvail().X, icon is null ? 24f.Scale() : (icon.Size.Y / 2f).Scale() + 4f)))
{
if (ImGui.Button("Back", new Vector2(0, 24f.Scale())))
{
Expand Down Expand Up @@ -121,7 +121,7 @@ private static void DrawHeadingContents(string jobName)
{
foreach (var (preset, info) in groupedPresets[jobName].Where(x => PresetStorage.IsPvP(x.Preset)))
{
InfoBox presetBox = new() { Color = Colors.Grey, BorderThickness = 1f, CurveRadius = 8f, ContentsAction = () => { Presets.DrawPreset(preset, info); } };
InfoBox presetBox = new() { Color = Colors.Grey, BorderThickness = 1f.Scale(), ContentsOffset = 8f.Scale(), ContentsAction = () => { Presets.DrawPreset(preset, info); } };

if (Service.Configuration.HideConflictedCombos)
{
Expand All @@ -148,7 +148,6 @@ private static void DrawHeadingContents(string jobName)
else
{
presetBox.Draw();
ImGuiHelpers.ScaledDummy(12.0f);
continue;
}
}
Expand Down