mirror of
https://github.com/xivdev/Penumbra.git
synced 2025-12-13 12:14:17 +01:00
Make temporary mode checkbox more visible.
This commit is contained in:
parent
cbebfe5e99
commit
a5d221dc13
3 changed files with 17 additions and 17 deletions
2
OtterGui
2
OtterGui
|
|
@ -1 +1 @@
|
||||||
Subproject commit 5704b2151bcdbf18b04dff1b199ca2f35765504f
|
Subproject commit ac32553b1e2e9feca7b9cd0c1b16eae81d5fcc31
|
||||||
|
|
@ -1,10 +1,9 @@
|
||||||
using Dalamud.Interface;
|
using Dalamud.Interface;
|
||||||
using ImGuiNET;
|
using ImGuiNET;
|
||||||
using OtterGui.Raii;
|
|
||||||
using OtterGui;
|
using OtterGui;
|
||||||
|
using OtterGui.Raii;
|
||||||
using OtterGui.Services;
|
using OtterGui.Services;
|
||||||
using OtterGui.Text;
|
using OtterGui.Text;
|
||||||
using OtterGui.Text.Widget;
|
|
||||||
using Penumbra.Collections;
|
using Penumbra.Collections;
|
||||||
using Penumbra.Collections.Manager;
|
using Penumbra.Collections.Manager;
|
||||||
using Penumbra.Interop.PathResolving;
|
using Penumbra.Interop.PathResolving;
|
||||||
|
|
@ -20,7 +19,6 @@ public class CollectionSelectHeader : IUiService
|
||||||
private readonly TutorialService _tutorial;
|
private readonly TutorialService _tutorial;
|
||||||
private readonly ModSelection _selection;
|
private readonly ModSelection _selection;
|
||||||
private readonly CollectionResolver _resolver;
|
private readonly CollectionResolver _resolver;
|
||||||
private readonly FontAwesomeCheckbox _temporaryCheckbox = new(FontAwesomeIcon.Stopwatch);
|
|
||||||
private readonly Configuration _config;
|
private readonly Configuration _config;
|
||||||
|
|
||||||
public CollectionSelectHeader(CollectionManager collectionManager, TutorialService tutorial, ModSelection selection,
|
public CollectionSelectHeader(CollectionManager collectionManager, TutorialService tutorial, ModSelection selection,
|
||||||
|
|
@ -64,14 +62,15 @@ public class CollectionSelectHeader : IUiService
|
||||||
var hold = _config.IncognitoModifier.IsActive();
|
var hold = _config.IncognitoModifier.IsActive();
|
||||||
using (ImRaii.PushStyle(ImGuiStyleVar.FrameBorderSize, ImUtf8.GlobalScale))
|
using (ImRaii.PushStyle(ImGuiStyleVar.FrameBorderSize, ImUtf8.GlobalScale))
|
||||||
{
|
{
|
||||||
var tint = ImGuiCol.Text.Tinted(ColorId.TemporaryModSettingsTint);
|
var tint = _config.DefaultTemporaryMode
|
||||||
using var color = ImRaii.PushColor(ImGuiCol.FrameBgHovered, ImGui.GetColorU32(ImGuiCol.FrameBg), !hold)
|
? ImGuiCol.Text.Tinted(ColorId.TemporaryModSettingsTint)
|
||||||
.Push(ImGuiCol.FrameBgActive, ImGui.GetColorU32(ImGuiCol.FrameBg), !hold)
|
: ImGui.GetColorU32(ImGuiCol.TextDisabled);
|
||||||
.Push(ImGuiCol.CheckMark, tint)
|
using var color = ImRaii.PushColor(ImGuiCol.ButtonHovered, ImGui.GetColorU32(ImGuiCol.FrameBg), !hold)
|
||||||
|
.Push(ImGuiCol.ButtonActive, ImGui.GetColorU32(ImGuiCol.FrameBg), !hold)
|
||||||
.Push(ImGuiCol.Border, tint, _config.DefaultTemporaryMode);
|
.Push(ImGuiCol.Border, tint, _config.DefaultTemporaryMode);
|
||||||
if (_temporaryCheckbox.Draw("##tempCheck"u8, _config.DefaultTemporaryMode, out var newValue) && hold)
|
if (ImUtf8.IconButton(FontAwesomeIcon.Stopwatch, ""u8, default, false, tint, ImGui.GetColorU32(ImGuiCol.FrameBg)) && hold)
|
||||||
{
|
{
|
||||||
_config.DefaultTemporaryMode = newValue;
|
_config.DefaultTemporaryMode = !_config.DefaultTemporaryMode;
|
||||||
_config.Save();
|
_config.Save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ using ImGuiNET;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using OtterGui;
|
using OtterGui;
|
||||||
using OtterGui.Classes;
|
using OtterGui.Classes;
|
||||||
|
using OtterGui.Extensions;
|
||||||
using OtterGui.Services;
|
using OtterGui.Services;
|
||||||
using OtterGui.Text;
|
using OtterGui.Text;
|
||||||
using OtterGui.Widgets;
|
using OtterGui.Widgets;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue