ToxicMushroom/mare.client
1
0
Fork 0
mirror of https://github.com/Caraxi/mare.client.git synced 2025-12-13 20:24:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix scaling imgui spaghetti

Browse source
This commit is contained in:
rootdarkarchon 2023-03-22 18:35:39 +01:00
parent 3cc3c7a7af
commit 8722de0763
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
MareSynchronos/UI/EditProfileUi.cs
View file

@ -37,7 +37,7 @@ public class EditProfileUi : WindowMediatorSubscriberBase
this.SizeConstraints = new() this.SizeConstraints = new()
{ {
MinimumSize = new(768, 512), MinimumSize = new(768, 512),
MaximumSize = new(2000, 2000) MaximumSize = new(768, 2000)
}; };
_apiController = apiController; _apiController = apiController;
_uiBuilder = uiBuilder; _uiBuilder = uiBuilder;
@ -89,7 +89,7 @@ public class EditProfileUi : WindowMediatorSubscriberBase
} }
var spacing = ImGui.GetStyle().ItemSpacing.X; var spacing = ImGui.GetStyle().ItemSpacing.X;
ImGui.SameLine(256 + spacing * 2); ImGuiHelpers.ScaledRelativeSameLine(256, spacing);
ImGui.PushFont(_uiBuilder.GetGameFontHandle(new GameFontStyle(GameFontFamilyAndSize.Axis12)).ImFont); ImGui.PushFont(_uiBuilder.GetGameFontHandle(new GameFontStyle(GameFontFamilyAndSize.Axis12)).ImFont);
var descriptionTextSize = ImGui.CalcTextSize(profile.Description, 256f); var descriptionTextSize = ImGui.CalcTextSize(profile.Description, 256f);
var childFrame = ImGuiHelpers.ScaledVector2(256 + ImGui.GetStyle().WindowPadding.X + ImGui.GetStyle().WindowBorderSize, 256); var childFrame = ImGuiHelpers.ScaledVector2(256 + ImGui.GetStyle().WindowPadding.X + ImGui.GetStyle().WindowBorderSize, 256);
@ -104,7 +104,6 @@ public class EditProfileUi : WindowMediatorSubscriberBase
childFrame = childFrame with childFrame = childFrame with
{ {
X = childFrame.X + (_adjustedForScollBarsOnlineProfile ? ImGui.GetStyle().ScrollbarSize : 0), X = childFrame.X + (_adjustedForScollBarsOnlineProfile ? ImGui.GetStyle().ScrollbarSize : 0),
Y = childFrame.Y / ImGuiHelpers.GlobalScale
}; };
if (ImGui.BeginChildFrame(101, childFrame)) if (ImGui.BeginChildFrame(101, childFrame))
{ {
@ -203,7 +202,6 @@ public class EditProfileUi : WindowMediatorSubscriberBase
childFrameLocal = childFrameLocal with childFrameLocal = childFrameLocal with
{ {
X = childFrameLocal.X + (_adjustedForScollBarsLocalProfile ? ImGui.GetStyle().ScrollbarSize : 0), X = childFrameLocal.X + (_adjustedForScollBarsLocalProfile ? ImGui.GetStyle().ScrollbarSize : 0),
Y = childFrameLocal.Y / ImGuiHelpers.GlobalScale
}; };
if (ImGui.BeginChildFrame(102, childFrameLocal)) if (ImGui.BeginChildFrame(102, childFrameLocal))
{ {