Skip to content

Commit 82d81fb

Browse files
committed
Fix UI scaling
1 parent 0560d67 commit 82d81fb

File tree

1 file changed

+20
-5
lines changed

1 file changed

+20
-5
lines changed

Source/Client.ImGui.cs

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// SPDX-License-Identifier: MPL-2.0
22
namespace Remote;
33

4-
using Vector4 = System.Numerics.Vector4;
5-
64
/// <inheritdoc cref="Client"/>
75
public sealed partial class Client
86
{
@@ -377,7 +375,7 @@ void ShowHintTab(Preferences preferences)
377375
ImGui.TextDisabled($"You can do {(ro.HintPoints / ro.HintCost).Conjugate("hint")} ({ro.HintPoints} points)");
378376
_ = ImGui.Checkbox("Show obtained hints", ref _showObtainedHints);
379377
ImGui.SetNextItemWidth(preferences.Width(150));
380-
_ = ImGui.ListBox("Filter", ref _hintIndex, s_hintOptions, s_hintOptions.Length);
378+
_ = ImGui.Combo("Filter", ref _hintIndex, s_hintOptions, s_hintOptions.Length);
381379

382380
if (LastHints is { } hints)
383381
foreach (var (itemFlags, message) in hints.Where(ShouldBeVisible)
@@ -449,6 +447,7 @@ void ShowLog(Preferences preferences)
449447
return;
450448
}
451449

450+
ImGui.SetWindowFontScale(preferences.UiScale);
452451
ShowMessages(preferences, 0);
453452

454453
if (ImGui.GetScrollY() >= ImGui.GetScrollMaxY())
@@ -628,7 +627,14 @@ bool Close(Preferences preferences, bool open)
628627
{
629628
Debug.Assert(_session is not null);
630629
ShowLocationSearch();
631-
ImGui.BeginChild("Locations", preferences.ChildSize(100));
630+
631+
if (!ImGui.BeginChild("Locations", preferences.ChildSize(100)))
632+
{
633+
ImGui.EndChild();
634+
return false;
635+
}
636+
637+
ImGui.SetWindowFontScale(preferences.UiScale);
632638
var locationHelper = _session.Locations;
633639
var locations = _showAlreadyChecked ? locationHelper.AllLocations : locationHelper.AllMissingLocations;
634640

@@ -648,7 +654,14 @@ bool Close(Preferences preferences, bool open)
648654
_ = ImGui.Checkbox("Show Out of Logic Locations", ref _showOutOfLogic);
649655
var setter = GetNextItemOpenSetter();
650656
ShowLocationSearch();
651-
ImGui.BeginChild("Locations", preferences.ChildSize(100));
657+
658+
if (!ImGui.BeginChild("Locations", preferences.ChildSize(100)))
659+
{
660+
ImGui.EndChild();
661+
return false;
662+
}
663+
664+
ImGui.SetWindowFontScale(preferences.UiScale);
652665
bool? ret = true;
653666

654667
foreach (var (category, locations) in _evaluator.CategoryToLocations)
@@ -700,6 +713,8 @@ bool ShowReleasedOrReleasingLocations(Preferences preferences)
700713
return false;
701714
}
702715

716+
ImGui.SetWindowFontScale(preferences.UiScale);
717+
703718
if (IsReleasing && _isAttemptingToRelease is null)
704719
{
705720
ShowMessages(preferences, _releaseIndex);

0 commit comments

Comments
 (0)