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

Improve some mousewheel stuff and add some tooltips.

Browse source
This commit is contained in:
Ottermandias 2024-02-06 18:01:05 +01:00
parent 346e4890b0
commit fc52d44c9c
4 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Glamourer/Gui/Customization/CustomizationDrawer.Simple.cs
View file

@ -36,7 +36,7 @@ public partial class CustomizationDrawer
var tmp = (int)_currentByte.Value; var tmp = (int)_currentByte.Value;
ImGui.SetNextItemWidth(_comboSelectorSize); ImGui.SetNextItemWidth(_comboSelectorSize);
if (ImGui.SliderInt("##slider", ref tmp, 0, _currentCount - 1, "%i", ImGuiSliderFlags.AlwaysClamp) if (ImGui.SliderInt("##slider", ref tmp, 0, _currentCount - 1, "%i", ImGuiSliderFlags.AlwaysClamp)
|| CaptureMouseWheel(ref tmp, 0, _currentCount - 1)) || CaptureMouseWheel(ref tmp, 0, _currentCount))
UpdateValue((CustomizeValue)tmp); UpdateValue((CustomizeValue)tmp);
} }

15
Glamourer/Gui/Equipment/EquipmentDrawer.cs
View file

@ -7,6 +7,7 @@ using Glamourer.Unlocks;
using ImGuiNET; using ImGuiNET;
using OtterGui; using OtterGui;
using OtterGui.Raii; using OtterGui.Raii;
using OtterGui.Widgets;
using Penumbra.GameData.DataContainers; using Penumbra.GameData.DataContainers;
using Penumbra.GameData.Enums; using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs; using Penumbra.GameData.Structs;
@ -139,7 +140,7 @@ public class EquipmentDrawer
public bool DrawAllStain(out StainId ret, bool locked) public bool DrawAllStain(out StainId ret, bool locked)
{ {
using var disabled = ImRaii.Disabled(locked); using var disabled = ImRaii.Disabled(locked);
var change = _stainCombo.Draw("Dye All Slots", Stain.None.RgbaColor, string.Empty, false, false); var change = _stainCombo.Draw("Dye All Slots", Stain.None.RgbaColor, string.Empty, false, false, MouseWheelType.None);
ret = Stain.None.RowIndex; ret = Stain.None.RowIndex;
if (change) if (change)
if (_stainData.TryGetValue(_stainCombo.CurrentSelection.Key, out var stain)) if (_stainData.TryGetValue(_stainCombo.CurrentSelection.Key, out var stain))
@ -464,12 +465,12 @@ public class EquipmentDrawer
(var tt, item, var valid) = (allowRevert && !revertItem.Equals(currentItem), allowClear && !clearItem.Equals(currentItem), (var tt, item, var valid) = (allowRevert && !revertItem.Equals(currentItem), allowClear && !clearItem.Equals(currentItem),
ImGui.GetIO().KeyCtrl) switch ImGui.GetIO().KeyCtrl) switch
{ {
(true, true, true) => ("Right-click to clear. Control and Right-Click to revert to game.", revertItem, true), (true, true, true) => ("Right-click to clear. Control and Right-Click to revert to game.\nControl and mouse wheel to scroll.", revertItem, true),
(true, true, false) => ("Right-click to clear. Control and Right-Click to revert to game.", clearItem, true), (true, true, false) => ("Right-click to clear. Control and Right-Click to revert to game.\nControl and mouse wheel to scroll.", clearItem, true),
(true, false, true) => ("Control and Right-Click to revert to game.", revertItem, true), (true, false, true) => ("Control and Right-Click to revert to game.\nControl and mouse wheel to scroll.", revertItem, true),
(true, false, false) => ("Control and Right-Click to revert to game.", default, false), (true, false, false) => ("Control and Right-Click to revert to game.\nControl and mouse wheel to scroll.", default, false),
(false, true, _) => ("Right-click to clear.", clearItem, true), (false, true, _) => ("Right-click to clear.\nControl and mouse wheel to scroll.", clearItem, true),
(false, false, _) => (string.Empty, default, false), (false, false, _) => ("Control and mouse wheel to scroll.", default, false),
}; };
ImGuiUtil.HoverTooltip(tt); ImGuiUtil.HoverTooltip(tt);

3
Glamourer/Gui/Equipment/GlamourerColorCombo.cs
View file

@ -36,9 +36,6 @@ public sealed class GlamourerColorCombo(float _comboWidth, DictStain _stains, Fa
return base.DrawSelectable(globalIdx, selected); return base.DrawSelectable(globalIdx, selected);
} }
public override bool Draw(string label, uint color, string name, bool found, bool gloss, float previewWidth)
=> base.Draw(label, color, name, found, gloss, previewWidth);
private static Func<IReadOnlyList<KeyValuePair<byte, (string Name, uint Color, bool Gloss)>>> CreateFunc(DictStain stains, private static Func<IReadOnlyList<KeyValuePair<byte, (string Name, uint Color, bool Gloss)>>> CreateFunc(DictStain stains,
FavoriteManager favorites) FavoriteManager favorites)
=> () => stains.Select(kvp => (kvp, favorites.Contains(kvp.Key))).OrderBy(p => !p.Item2).Select(p => p.kvp) => () => stains.Select(kvp => (kvp, favorites.Contains(kvp.Key))).OrderBy(p => !p.Item2).Select(p => p.kvp)

2
OtterGui

@ -1 +1 @@
Subproject commit 2d8a03eebd80e19c6936a28ab2e3a8c164cc17f3 Subproject commit 1a187f756f2e8823197bd43db1c3383231f5eaff