Child removed to be able to display buttons with icon and text also in tables
This commit is contained in:
@@ -605,22 +605,18 @@ 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.SameLine();
|
||||||
ImGui.SetCursorPosX(padding.X);
|
ImGui.SetCursorPosX(ImGui.GetCursorPosX() - buttonSize.X - padding.X);
|
||||||
ImGui.PushFont(UiBuilder.IconFont);
|
ImGui.PushFont(UiBuilder.IconFont);
|
||||||
ImGui.Text(icon.ToIconString());
|
ImGui.Text(icon.ToIconString());
|
||||||
ImGui.PopFont();
|
ImGui.PopFont();
|
||||||
ImGui.SameLine();
|
ImGui.SameLine();
|
||||||
ImGui.Text(text);
|
ImGui.Text(text);
|
||||||
ImGui.EndChild();
|
|
||||||
}
|
|
||||||
|
|
||||||
return buttonClicked;
|
return buttonClicked;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user