github/SharpIDE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace EveryValueChanged with ReactiveProperty

Browse Source
This commit is contained in:
Matt Parker
2025-12-05 20:55:03 +10:00
parent 275e822b77
commit b562c4c129
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
View File

@@ -376,7 +376,7 @@ public partial class SharpIdeCodeEdit : CodeEdit
if (@event is InputEventMouseButton { Pressed: true } mouseEvent)
{
var (col, line) = GetLineColumnAtPos((Vector2I)mouseEvent.Position);
var current = _navigationHistoryService.Current;
var current = _navigationHistoryService.Current.Value;
if (current!.File != _currentFile) throw new InvalidOperationException("Current navigation history file does not match the focused code editor file.");
if (current.LinePosition.Line != line) // Only record a new navigation if the line has changed
{

13
src/SharpIDE.Godot/Features/Navigation/ForwardBackwardButtonContainer.cs
View File

@@ -17,26 +17,27 @@ public partial class ForwardBackwardButtonContainer : HBoxContainer
_forwardButton = GetNode<Button>("ForwardButton");
_backwardButton.Pressed += OnBackwardButtonPressed;
_forwardButton.Pressed += OnForwardButtonPressed;
Observable.EveryValueChanged(_navigationHistoryService, navigationHistoryService => navigationHistoryService.Current)
.Where(s => s is not null)
.Subscribe(s =>
_navigationHistoryService.Current.SubscribeOnThreadPool().SubscribeAwait(async (s, ct) =>
{
await this.InvokeAsync(() =>
{
_backwardButton.Disabled = !_navigationHistoryService.CanGoBack;
_forwardButton.Disabled = !_navigationHistoryService.CanGoForward;
}).AddTo(this);
});
}).AddTo(this);
}
private void OnBackwardButtonPressed()
{
_navigationHistoryService.GoBack();
var current = _navigationHistoryService.Current;
var current = _navigationHistoryService.Current.Value;
GodotGlobalEvents.Instance.FileExternallySelected.InvokeParallelFireAndForget(current!.File, current.LinePosition);
}
private void OnForwardButtonPressed()
{
_navigationHistoryService.GoForward();
var current = _navigationHistoryService.Current;
var current = _navigationHistoryService.Current.Value;
GodotGlobalEvents.Instance.FileExternallySelected.InvokeParallelFireAndForget(current!.File, current.LinePosition);
}
}