t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix staging issues

Browse Source
This commit is contained in:
rootdarkarchon
2023-11-10 00:40:46 +01:00
parent 4b3bd975d5
commit c196cdd344
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
MareSynchronos/UI/CompactUI.cs
View File

@@ -1,6 +1,5 @@
using Dalamud.Interface; using Dalamud.Interface;
using Dalamud.Interface.Colors; using Dalamud.Interface.Colors;
using Dalamud.Interface.Components;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Utility; using Dalamud.Utility;
@@ -69,7 +68,8 @@ public class CompactUi : WindowMediatorSubscriberBase
_selectPairsForGroupUi = selectPairForTagUi; _selectPairsForGroupUi = selectPairForTagUi;
_tabMenu = new TopTabMenu(Mediator, _apiController, _pairManager); _tabMenu = new TopTabMenu(Mediator, _apiController, _pairManager);
AllowPinning = false; // todo: reenable when dalamud title bar buttons are out of staging
/*AllowPinning = false;
AllowClickthrough = false; AllowClickthrough = false;
TitleBarButtons = new() TitleBarButtons = new()
{ {
@@ -82,7 +82,7 @@ public class CompactUi : WindowMediatorSubscriberBase
}, },
IconOffset = new(2,1) IconOffset = new(2,1)
} }
}; };*/
_drawFolders = GetDrawFolders().ToList(); _drawFolders = GetDrawFolders().ToList();
@@ -371,6 +371,17 @@ public class CompactUi : WindowMediatorSubscriberBase
} }
UiSharedService.AttachToolTip("Click to copy"); UiSharedService.AttachToolTip("Click to copy");
// todo: remove when dalamud title bar buttons are out of staging
ImGui.SetWindowFontScale(1.5f);
var buttonSize = UiSharedService.GetIconButtonSize(FontAwesomeIcon.Cog);
ImGui.SameLine();
ImGui.SetCursorPosX(ImGui.GetWindowContentRegionMax().X - buttonSize.X);
if (UiSharedService.NormalizedIconButton(FontAwesomeIcon.Cog))
{
Mediator.Publish(new UiToggleMessage(typeof(SettingsUi)));
}
ImGui.SetWindowFontScale(1.0f);
if (!string.Equals(_apiController.DisplayName, _apiController.UID, StringComparison.Ordinal)) if (!string.Equals(_apiController.DisplayName, _apiController.UID, StringComparison.Ordinal))
{ {
var origTextSize = ImGui.CalcTextSize(_apiController.UID); var origTextSize = ImGui.CalcTextSize(_apiController.UID);

5
MareSynchronos/UI/SettingsUi.cs
View File

@@ -69,8 +69,9 @@ public class SettingsUi : WindowMediatorSubscriberBase
_apiController = apiController; _apiController = apiController;
_fileCompactor = fileCompactor; _fileCompactor = fileCompactor;
_uiShared = uiShared; _uiShared = uiShared;
AllowClickthrough = false; // todo: reenable when dalamud is out of staging
AllowPinning = false; /*AllowClickthrough = false;
AllowPinning = false;*/
SizeConstraints = new WindowSizeConstraints() SizeConstraints = new WindowSizeConstraints()
{ {