Lightless-Sync/LightlessClient
8
1
Fork 2
Code Issues 2 Pull Requests 3 Actions Packages Projects Releases 57 Wiki Activity

updated layout and adjusted scanning

Browse Source
This commit is contained in:
Essie
2025-09-25 06:06:19 +09:00
parent 7569b15993
commit e8f8512cdd
4 changed files with 148 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
LightlessSync/UI/UISharedService.cs
View File

@@ -1144,11 +1144,11 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
IconText(icon, color == null ? ImGui.GetColorU32(ImGuiCol.Text) : ImGui.GetColorU32(color.Value));
}
public bool IconTextButton(FontAwesomeIcon icon, string text, float? width = null, bool isInPopup = false)
public bool IconTextButton(FontAwesomeIcon icon, string text, float? width = null, bool isInPopup = false, bool? center = null)
{
return IconTextButtonInternal(icon, text,
isInPopup ? ColorHelpers.RgbaUintToVector4(ImGui.GetColorU32(ImGuiCol.PopupBg)) : null,
width <= 0 ? null : width);
width <= 0 ? null : width, center);
}
public IDalamudTextureWrap LoadImage(byte[] imageData)
@@ -1212,7 +1212,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
ImGui.TextUnformatted(text);
}
private bool IconTextButtonInternal(FontAwesomeIcon icon, string text, Vector4? defaultColor = null, float? width = null)
private bool IconTextButtonInternal(FontAwesomeIcon icon, string text, Vector4? defaultColor = null, float? width = null, bool? center = null)
{
int num = 0;
if (defaultColor.HasValue)
@@ -1222,19 +1222,35 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
}
ImGui.PushID(text);
Vector2 vector;
using (IconFont.Push())
vector = ImGui.CalcTextSize(icon.ToIconString());
Vector2 vector2 = ImGui.CalcTextSize(text);
ImDrawListPtr windowDrawList = ImGui.GetWindowDrawList();
Vector2 cursorScreenPos = ImGui.GetCursorScreenPos();
float num2 = 3f * ImGuiHelpers.GlobalScale;
float x = width ?? vector.X + vector2.X + ImGui.GetStyle().FramePadding.X * 2f + num2;
float totalTextWidth = vector.X + num2 + vector2.X;
float x = width ?? totalTextWidth + ImGui.GetStyle().FramePadding.X * 2f;
float frameHeight = ImGui.GetFrameHeight();
bool result = ImGui.Button(string.Empty, new Vector2(x, frameHeight));
Vector2 pos = new Vector2(cursorScreenPos.X + ImGui.GetStyle().FramePadding.X, cursorScreenPos.Y + ImGui.GetStyle().FramePadding.Y);
bool shouldCenter = center == true;
Vector2 pos = shouldCenter
? new Vector2(
cursorScreenPos.X + (x - totalTextWidth) / 2f,
cursorScreenPos.Y + (frameHeight - vector.Y) / 2f)
: new Vector2(
cursorScreenPos.X + ImGui.GetStyle().FramePadding.X,
cursorScreenPos.Y + ImGui.GetStyle().FramePadding.Y);
using (IconFont.Push())
windowDrawList.AddText(pos, ImGui.GetColorU32(ImGuiCol.Text), icon.ToIconString());
Vector2 pos2 = new Vector2(pos.X + vector.X + num2, cursorScreenPos.Y + ImGui.GetStyle().FramePadding.Y);
windowDrawList.AddText(pos2, ImGui.GetColorU32(ImGuiCol.Text), text);
ImGui.PopID();