friendlynamazu/client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix code dupe

Browse Source
This commit is contained in:
rootdarkarchon
2024-03-25 19:34:15 +01:00
parent 59ade9dc0c
commit 39aa244a9f
6 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareSynchronos/UI/CompactUI.cs
View File

@@ -257,7 +257,7 @@ public class CompactUi : WindowMediatorSubscriberBase
} }
private void DrawServerStatus() private void DrawServerStatus()
{ {
var buttonSize = _uiSharedService.IconButtonSize(FontAwesomeIcon.Link); var buttonSize = _uiSharedService.GetIconButtonSize(FontAwesomeIcon.Link);
var userCount = _apiController.OnlineUsers.ToString(CultureInfo.InvariantCulture); var userCount = _apiController.OnlineUsers.ToString(CultureInfo.InvariantCulture);
var userSize = ImGui.CalcTextSize(userCount); var userSize = ImGui.CalcTextSize(userCount);
var textSize = ImGui.CalcTextSize("Users Online"); var textSize = ImGui.CalcTextSize("Users Online");

2
MareSynchronos/UI/Components/DrawFolderBase.cs
View File

@@ -98,7 +98,7 @@ public abstract class DrawFolderBase : IDrawFolder
private float DrawRightSideInternal() private float DrawRightSideInternal()
{ {
var barButtonSize = _uiSharedService.IconButtonSize(FontAwesomeIcon.EllipsisV); var barButtonSize = _uiSharedService.GetIconButtonSize(FontAwesomeIcon.EllipsisV);
var spacingX = ImGui.GetStyle().ItemSpacing.X; var spacingX = ImGui.GetStyle().ItemSpacing.X;
var windowEndX = ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth(); var windowEndX = ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth();

2
MareSynchronos/UI/Components/DrawFolderGroup.cs
View File

@@ -169,7 +169,7 @@ public class DrawFolderGroup : DrawFolderBase
var spacingX = ImGui.GetStyle().ItemSpacing.X; var spacingX = ImGui.GetStyle().ItemSpacing.X;
FontAwesomeIcon pauseIcon = _groupFullInfoDto.GroupUserPermissions.IsPaused() ? FontAwesomeIcon.Play : FontAwesomeIcon.Pause; FontAwesomeIcon pauseIcon = _groupFullInfoDto.GroupUserPermissions.IsPaused() ? FontAwesomeIcon.Play : FontAwesomeIcon.Pause;
var pauseButtonSize = _uiSharedService.IconButtonSize(pauseIcon); var pauseButtonSize = _uiSharedService.GetIconButtonSize(pauseIcon);
var userCogButtonSize = _uiSharedService.GetIconData(FontAwesomeIcon.UsersCog); var userCogButtonSize = _uiSharedService.GetIconData(FontAwesomeIcon.UsersCog);

2
MareSynchronos/UI/Components/DrawFolderTag.cs
View File

@@ -137,7 +137,7 @@ public class DrawFolderTag : DrawFolderBase
var allArePaused = _allPairs.All(pair => pair.UserPair!.OwnPermissions.IsPaused()); var allArePaused = _allPairs.All(pair => pair.UserPair!.OwnPermissions.IsPaused());
var pauseButton = allArePaused ? FontAwesomeIcon.Play : FontAwesomeIcon.Pause; var pauseButton = allArePaused ? FontAwesomeIcon.Play : FontAwesomeIcon.Pause;
var pauseButtonX = _uiSharedService.IconButtonSize(pauseButton).X; var pauseButtonX = _uiSharedService.GetIconButtonSize(pauseButton).X;
var buttonPauseOffset = currentRightSideX - pauseButtonX; var buttonPauseOffset = currentRightSideX - pauseButtonX;
ImGui.SameLine(buttonPauseOffset); ImGui.SameLine(buttonPauseOffset);

4
MareSynchronos/UI/Components/DrawUserPair.cs
View File

@@ -301,8 +301,8 @@ public class DrawUserPair
private float DrawRightSide() private float DrawRightSide()
{ {
var pauseIcon = _pair.UserPair!.OwnPermissions.IsPaused() ? FontAwesomeIcon.Play : FontAwesomeIcon.Pause; var pauseIcon = _pair.UserPair!.OwnPermissions.IsPaused() ? FontAwesomeIcon.Play : FontAwesomeIcon.Pause;
var pauseIconSize = _uiSharedService.IconButtonSize(pauseIcon); var pauseIconSize = _uiSharedService.GetIconButtonSize(pauseIcon);
var barButtonSize = _uiSharedService.IconButtonSize(FontAwesomeIcon.EllipsisV); var barButtonSize = _uiSharedService.GetIconButtonSize(FontAwesomeIcon.EllipsisV);
var spacingX = ImGui.GetStyle().ItemSpacing.X; var spacingX = ImGui.GetStyle().ItemSpacing.X;
var windowEndX = ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth(); var windowEndX = ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth();
float currentRightSide = windowEndX - barButtonSize.X; float currentRightSide = windowEndX - barButtonSize.X;

9
MareSynchronos/UI/UISharedService.cs
View File

@@ -810,8 +810,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
public Vector2 GetIconButtonSize(FontAwesomeIcon icon) public Vector2 GetIconButtonSize(FontAwesomeIcon icon)
{ {
using var font = IconFont.Push(); using var font = IconFont.Push();
var buttonSize = ImGuiHelpers.GetButtonSize(icon.ToIconString()); return ImGuiHelpers.GetButtonSize(icon.ToIconString());
return buttonSize;
} }
public Vector2 GetIconData(FontAwesomeIcon icon) public Vector2 GetIconData(FontAwesomeIcon icon)
@@ -820,12 +819,6 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
return ImGui.CalcTextSize(icon.ToIconString()); return ImGui.CalcTextSize(icon.ToIconString());
} }
public Vector2 IconButtonSize(FontAwesomeIcon icon)
{
using var font = IconFont.Push();
return ImGuiHelpers.GetButtonSize(icon.ToIconString());
}
public void IconText(FontAwesomeIcon icon, uint color) public void IconText(FontAwesomeIcon icon, uint color)
{ {
FontText(icon.ToIconString(), IconFont, color); FontText(icon.ToIconString(), IconFont, color);