ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-14 20:54:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply OtterGui changes.

Browse source
This commit is contained in:
Ottermandias 2023-02-02 12:00:03 +01:00
parent 5997ddca02
commit c2b3e4dbaf
6 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
OtterGui

@ -1 +1 @@
Subproject commit 2c73fd57bf53fc3c9f390db0acc9e176607c2dbc Subproject commit 4e730a0d5a86a9819bcea0b766134c02f35ac27e

10
Penumbra/UI/Classes/ItemSwapWindow.cs
View file

@ -399,7 +399,7 @@ public class ItemSwapWindow : IDisposable
ImGui.AlignTextToFramePadding(); ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted( text1 ); ImGui.TextUnformatted( text1 );
ImGui.TableNextColumn(); ImGui.TableNextColumn();
_dirty |= sourceSelector.Draw( "##itemSource", sourceSelector.CurrentSelection.Item1 ?? string.Empty, InputWidth * 2, ImGui.GetTextLineHeightWithSpacing() ); _dirty |= sourceSelector.Draw( "##itemSource", sourceSelector.CurrentSelection.Item1 ?? string.Empty, string.Empty, InputWidth * 2, ImGui.GetTextLineHeightWithSpacing() );
if( type == SwapType.Ring ) if( type == SwapType.Ring )
{ {
@ -411,7 +411,7 @@ public class ItemSwapWindow : IDisposable
ImGui.AlignTextToFramePadding(); ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted( text2 ); ImGui.TextUnformatted( text2 );
ImGui.TableNextColumn(); ImGui.TableNextColumn();
_dirty |= targetSelector.Draw( "##itemTarget", targetSelector.CurrentSelection.Item1 ?? string.Empty, InputWidth * 2, ImGui.GetTextLineHeightWithSpacing() ); _dirty |= targetSelector.Draw( "##itemTarget", targetSelector.CurrentSelection.Item1 ?? string.Empty, string.Empty, InputWidth * 2, ImGui.GetTextLineHeightWithSpacing() );
if( type == SwapType.Ring ) if( type == SwapType.Ring )
{ {
ImGui.SameLine(); ImGui.SameLine();
@ -503,7 +503,7 @@ public class ItemSwapWindow : IDisposable
ImGui.AlignTextToFramePadding(); ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted( "Select the weapon or tool you want" ); ImGui.TextUnformatted( "Select the weapon or tool you want" );
ImGui.TableNextColumn(); ImGui.TableNextColumn();
if( _slotSelector.Draw( "##weaponSlot", _slotSelector.CurrentSelection.ToName(), InputWidth * 2, ImGui.GetTextLineHeightWithSpacing() ) ) if( _slotSelector.Draw( "##weaponSlot", _slotSelector.CurrentSelection.ToName(), string.Empty, InputWidth * 2, ImGui.GetTextLineHeightWithSpacing() ) )
{ {
_dirty = true; _dirty = true;
_weaponSource = new ItemSelector( _slotSelector.CurrentSelection ); _weaponSource = new ItemSelector( _slotSelector.CurrentSelection );
@ -520,13 +520,13 @@ public class ItemSwapWindow : IDisposable
ImGui.AlignTextToFramePadding(); ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted( "and put this variant of it" ); ImGui.TextUnformatted( "and put this variant of it" );
ImGui.TableNextColumn(); ImGui.TableNextColumn();
_dirty |= _weaponSource.Draw( "##weaponSource", _weaponSource.CurrentSelection.Item1 ?? string.Empty, InputWidth * 2, ImGui.GetTextLineHeightWithSpacing() ); _dirty |= _weaponSource.Draw( "##weaponSource", _weaponSource.CurrentSelection.Item1 ?? string.Empty, string.Empty, InputWidth * 2, ImGui.GetTextLineHeightWithSpacing() );
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.AlignTextToFramePadding(); ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted( "onto this one" ); ImGui.TextUnformatted( "onto this one" );
ImGui.TableNextColumn(); ImGui.TableNextColumn();
_dirty |= _weaponTarget.Draw( "##weaponTarget", _weaponTarget.CurrentSelection.Item1 ?? string.Empty, InputWidth * 2, ImGui.GetTextLineHeightWithSpacing() ); _dirty |= _weaponTarget.Draw( "##weaponTarget", _weaponTarget.CurrentSelection.Item1 ?? string.Empty, string.Empty, InputWidth * 2, ImGui.GetTextLineHeightWithSpacing() );
} }
private const float InputWidth = 120; private const float InputWidth = 120;

4
Penumbra/UI/Classes/ModEditWindow.Materials.cs
View file

@ -268,7 +268,7 @@ public partial class ModEditWindow
ImGui.SameLine(); ImGui.SameLine();
var label = dyeId == 0 ? "Preview Dye###previewDye" : $"{name} (Preview)###previewDye"; var label = dyeId == 0 ? "Preview Dye###previewDye" : $"{name} (Preview)###previewDye";
Penumbra.StainManager.StainCombo.Draw( label, dyeColor, true ); Penumbra.StainManager.StainCombo.Draw( label, dyeColor, string.Empty, true );
return false; return false;
} }
@ -508,7 +508,7 @@ public partial class ModEditWindow
ImGui.TableNextColumn(); ImGui.TableNextColumn();
if( hasDye ) if( hasDye )
{ {
if( Penumbra.StainManager.TemplateCombo.Draw( "##dyeTemplate", dye.Template.ToString(), intSize if( Penumbra.StainManager.TemplateCombo.Draw( "##dyeTemplate", dye.Template.ToString(), string.Empty, intSize
+ ImGui.GetStyle().ScrollbarSize / 2, ImGui.GetTextLineHeightWithSpacing(), ImGuiComboFlags.NoArrowButton ) ) + ImGui.GetStyle().ScrollbarSize / 2, ImGui.GetTextLineHeightWithSpacing(), ImGuiComboFlags.NoArrowButton ) )
{ {
file.ColorDyeSets[ colorSetIdx ].Rows[ rowIdx ].Template = Penumbra.StainManager.TemplateCombo.CurrentSelection; file.ColorDyeSets[ colorSetIdx ].Rows[ rowIdx ].Template = Penumbra.StainManager.TemplateCombo.CurrentSelection;

4
Penumbra/UI/ConfigWindow.CollectionsTab.Individual.cs
View file

@ -33,7 +33,7 @@ public partial class ConfigWindow
=> obj.Value; => obj.Value;
public bool Draw( float width ) public bool Draw( float width )
=> Draw( "##worldCombo", CurrentSelection.Value, width, ImGui.GetTextLineHeightWithSpacing() ); => Draw( "##worldCombo", CurrentSelection.Value, string.Empty, width, ImGui.GetTextLineHeightWithSpacing() );
} }
private sealed class NpcCombo : FilterComboCache< (string Name, uint[] Ids) > private sealed class NpcCombo : FilterComboCache< (string Name, uint[] Ids) >
@ -60,7 +60,7 @@ public partial class ConfigWindow
} }
public bool Draw( float width ) public bool Draw( float width )
=> Draw( _label, CurrentSelection.Name, width, ImGui.GetTextLineHeightWithSpacing() ); => Draw( _label, CurrentSelection.Name, string.Empty, width, ImGui.GetTextLineHeightWithSpacing() );
} }

2
Penumbra/UI/ConfigWindow.CollectionsTab.cs
View file

@ -167,7 +167,7 @@ public partial class ConfigWindow
public void Draw() public void Draw()
{ {
var preview = CurrentIdx >= 0 ? Items[ CurrentIdx ].Item2 : string.Empty; var preview = CurrentIdx >= 0 ? Items[ CurrentIdx ].Item2 : string.Empty;
Draw( _label, preview, ref CurrentIdx, _unscaledWidth * ImGuiHelpers.GlobalScale, ImGui.GetTextLineHeightWithSpacing() ); Draw( _label, preview, string.Empty, ref CurrentIdx, _unscaledWidth * ImGuiHelpers.GlobalScale, ImGui.GetTextLineHeightWithSpacing() );
} }
protected override string ToString( (CollectionType, string, string) obj ) protected override string ToString( (CollectionType, string, string) obj )

4
Penumbra/UI/ConfigWindow.Misc.cs
View file

@ -122,7 +122,7 @@ public partial class ConfigWindow
public void Draw( string label, float width, int individualIdx ) public void Draw( string label, float width, int individualIdx )
{ {
var (_, collection) = Penumbra.CollectionManager.Individuals[ individualIdx ]; var (_, collection) = Penumbra.CollectionManager.Individuals[ individualIdx ];
if( Draw( label, collection.Name, width, ImGui.GetTextLineHeightWithSpacing() ) && CurrentSelection != null ) if( Draw( label, collection.Name, string.Empty, width, ImGui.GetTextLineHeightWithSpacing() ) && CurrentSelection != null )
{ {
Penumbra.CollectionManager.SetCollection( CurrentSelection, CollectionType.Individual, individualIdx ); Penumbra.CollectionManager.SetCollection( CurrentSelection, CollectionType.Individual, individualIdx );
} }
@ -131,7 +131,7 @@ public partial class ConfigWindow
public void Draw( string label, float width, CollectionType type ) public void Draw( string label, float width, CollectionType type )
{ {
var current = Penumbra.CollectionManager.ByType( type, ActorIdentifier.Invalid ); var current = Penumbra.CollectionManager.ByType( type, ActorIdentifier.Invalid );
if( Draw( label, current?.Name ?? string.Empty, width, ImGui.GetTextLineHeightWithSpacing() ) && CurrentSelection != null ) if( Draw( label, current?.Name ?? string.Empty, string.Empty, width, ImGui.GetTextLineHeightWithSpacing() ) && CurrentSelection != null )
{ {
Penumbra.CollectionManager.SetCollection( CurrentSelection, type ); Penumbra.CollectionManager.SetCollection( CurrentSelection, type );
} }