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

Child removed to be able to display buttons with icon and text also in tables

Browse source
This commit is contained in:
xPumaa 2022-10-07 21:04:33 +02:00
parent ae44599db0
commit 3efd198c6c
1 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
MareSynchronos/UI/UIShared.cs
View file

@ -605,23 +605,19 @@ public class UiShared : IDisposable
var buttonSizeY = (iconSize.Y > textSize.Y ? iconSize.Y : textSize.Y) + padding.Y * 2; var buttonSizeY = (iconSize.Y > textSize.Y ? iconSize.Y : textSize.Y) + padding.Y * 2;
var buttonSize = new Vector2(buttonSizeX, buttonSizeY); var buttonSize = new Vector2(buttonSizeX, buttonSizeY);
if (ImGui.BeginChild(icon.ToIconString() + text, buttonSize)) if (ImGui.Button("###" + icon.ToIconString() + text, buttonSize))
{ {
if (ImGui.Button("", buttonSize)) buttonClicked = true;
{
buttonClicked = true;
}
ImGui.SameLine();
ImGui.SetCursorPosX(padding.X);
ImGui.PushFont(UiBuilder.IconFont);
ImGui.Text(icon.ToIconString());
ImGui.PopFont();
ImGui.SameLine();
ImGui.Text(text);
ImGui.EndChild();
} }
ImGui.SameLine();
ImGui.SetCursorPosX(ImGui.GetCursorPosX() - buttonSize.X - padding.X);
ImGui.PushFont(UiBuilder.IconFont);
ImGui.Text(icon.ToIconString());
ImGui.PopFont();
ImGui.SameLine();
ImGui.Text(text);
return buttonClicked; return buttonClicked;
} }