ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 05:04:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Installer spacing + reduce search bar length (#953)

Browse source
This commit is contained in:
Aireil 2022-08-03 19:05:12 +02:00 • committed by GitHub
parent a3a9f9e624
commit b96c212f76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
View file

@ -235,16 +235,19 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
ImGui.SetCursorPos(Vector2.Zero); ImGui.SetCursorPos(Vector2.Zero);
var windowSize = ImGui.GetWindowSize(); var windowSize = ImGui.GetWindowSize();
var titleHeight = ImGui.GetFontSize() + (ImGui.GetStyle().FramePadding.Y * 2);
ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, Vector2.Zero);
ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
ImGui.PushStyleVar(ImGuiStyleVar.CellPadding, Vector2.Zero);;
ImGui.PushStyleVar(ImGuiStyleVar.ChildBorderSize, 0);
ImGui.PushStyleVar(ImGuiStyleVar.ChildRounding, 0);
ImGui.SetNextWindowBgAlpha(0.8f);
if (ImGui.BeginChild("###installerLoadingFrame", new Vector2(-1, -1), false)) if (ImGui.BeginChild("###installerLoadingFrame", new Vector2(-1, -1), false))
{ {
ImGui.GetWindowDrawList().PushClipRectFullScreen();
ImGui.GetWindowDrawList().AddRectFilled(
ImGui.GetWindowPos() + new Vector2(0, titleHeight),
ImGui.GetWindowPos() + windowSize,
0xCC000000,
ImGui.GetStyle().WindowRounding,
ImDrawFlags.RoundCornersBottom);
ImGui.PopClipRect();
ImGui.SetCursorPosY(windowSize.Y / 2); ImGui.SetCursorPosY(windowSize.Y / 2);
switch (this.loadingIndicatorKind) switch (this.loadingIndicatorKind)
@ -303,6 +306,7 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
if (currentProgress != total) if (currentProgress != total)
{ {
ImGui.SetCursorPosX(windowSize.X / 3);
ImGui.ProgressBar(currentProgress / (float)total, new Vector2(windowSize.X / 3, 50)); ImGui.ProgressBar(currentProgress / (float)total, new Vector2(windowSize.X / 3, 50));
} }
} }
@ -314,8 +318,6 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
ImGui.EndChild(); ImGui.EndChild();
} }
ImGui.PopStyleVar(5);
} }
private void DrawHeader() private void DrawHeader()
@ -325,8 +327,8 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
ImGui.SetCursorPosY(ImGui.GetCursorPosY() - (5 * ImGuiHelpers.GlobalScale)); ImGui.SetCursorPosY(ImGui.GetCursorPosY() - (5 * ImGuiHelpers.GlobalScale));
var searchInputWidth = 240 * ImGuiHelpers.GlobalScale; var searchInputWidth = 180 * ImGuiHelpers.GlobalScale;
var searchClearButtonWidth = 40 * ImGuiHelpers.GlobalScale; var searchClearButtonWidth = 25 * ImGuiHelpers.GlobalScale;
var sortByText = Locs.SortBy_Label; var sortByText = Locs.SortBy_Label;
var sortByTextWidth = ImGui.CalcTextSize(sortByText).X; var sortByTextWidth = ImGui.CalcTextSize(sortByText).X;
@ -349,9 +351,10 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
ImGui.SameLine(); ImGui.SameLine();
// Shift down a little to align with the middle of the header text // Shift down a little to align with the middle of the header text
ImGui.SetCursorPosY(ImGui.GetCursorPosY() + (headerTextSize.Y / 4) - 2); var downShift = ImGui.GetCursorPosY() + (headerTextSize.Y / 4) - 2;
ImGui.SetCursorPosY(downShift);
ImGui.SetCursorPosX(windowSize.X - sortSelectWidth - style.ItemSpacing.X - searchInputWidth - searchClearButtonWidth); ImGui.SetCursorPosX(windowSize.X - sortSelectWidth - (style.ItemSpacing.X * 2) - searchInputWidth - searchClearButtonWidth);
var searchTextChanged = false; var searchTextChanged = false;
ImGui.SetNextItemWidth(searchInputWidth); ImGui.SetNextItemWidth(searchInputWidth);
@ -362,6 +365,7 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
100); 100);
ImGui.SameLine(); ImGui.SameLine();
ImGui.SetCursorPosY(downShift);
ImGui.SetNextItemWidth(searchClearButtonWidth); ImGui.SetNextItemWidth(searchClearButtonWidth);
if (ImGuiComponents.IconButton(FontAwesomeIcon.Times)) if (ImGuiComponents.IconButton(FontAwesomeIcon.Times))
@ -374,7 +378,7 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
this.UpdateCategoriesOnSearchChange(); this.UpdateCategoriesOnSearchChange();
ImGui.SameLine(); ImGui.SameLine();
ImGui.SetCursorPosX(windowSize.X - sortSelectWidth); ImGui.SetCursorPosY(downShift);
ImGui.SetNextItemWidth(selectableWidth); ImGui.SetNextItemWidth(selectableWidth);
if (ImGui.BeginCombo(sortByText, this.filterText, ImGuiComboFlags.NoArrowButton)) if (ImGui.BeginCombo(sortByText, this.filterText, ImGuiComboFlags.NoArrowButton))
{ {