ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'net5' of github.com:goatcorp/Dalamud

Browse source
This commit is contained in:
goat 2022-08-21 18:52:03 +02:00
commit ad66ab9be5
No known key found for this signature in database
GPG key ID: 7773BB5B43BA52E5
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Dalamud.csproj
View file

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Feature"> <PropertyGroup Label="Feature">
<DalamudVersion>6.4.0.43</DalamudVersion> <DalamudVersion>6.4.0.44</DalamudVersion>
<Description>XIV Launcher addon framework</Description> <Description>XIV Launcher addon framework</Description>
<AssemblyVersion>$(DalamudVersion)</AssemblyVersion> <AssemblyVersion>$(DalamudVersion)</AssemblyVersion>
<Version>$(DalamudVersion)</Version> <Version>$(DalamudVersion)</Version>

10
Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
View file

@ -232,7 +232,9 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
/// </summary> /// </summary>
public void OpenPluginChangelogs() public void OpenPluginChangelogs()
{ {
// Changelog group
this.categoryManager.CurrentGroupIdx = 3; this.categoryManager.CurrentGroupIdx = 3;
// Plugins category
this.categoryManager.CurrentCategoryIdx = 2; this.categoryManager.CurrentCategoryIdx = 2;
this.IsOpen = true; this.IsOpen = true;
} }
@ -406,6 +408,11 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
if (searchTextChanged) if (searchTextChanged)
this.UpdateCategoriesOnSearchChange(); this.UpdateCategoriesOnSearchChange();
// Changelog group
var isSortDisabled = this.categoryManager.CurrentGroupIdx == 3;
if (isSortDisabled)
ImGui.BeginDisabled();
ImGui.SameLine(); ImGui.SameLine();
ImGui.SetCursorPosY(downShift); ImGui.SetCursorPosY(downShift);
ImGui.SetNextItemWidth(selectableWidth); ImGui.SetNextItemWidth(selectableWidth);
@ -424,6 +431,9 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
ImGui.EndCombo(); ImGui.EndCombo();
} }
if (isSortDisabled)
ImGui.EndDisabled();
} }
private void DrawFooter() private void DrawFooter()