From 602efafa886c458075ae9cc8285593f985cc1227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A4ll=C3=A9n?= Date: Fri, 9 Aug 2024 09:36:16 +0200 Subject: [PATCH] Fix: build break and more warnings removed --- src/Gui/Controls/IComboBox.cs | 4 ++-- src/UserInterfaces/AvaloniaUI/Controls/TextView.cs | 2 +- .../WindowsForms/Forms/FindStringsDialog.cs | 2 +- .../WindowsForms/SearchResultServiceImpl.cs | 12 +++++++----- .../WindowsForms/ToolStripComboBoxWrapper.cs | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/Gui/Controls/IComboBox.cs b/src/Gui/Controls/IComboBox.cs index bc0204f150..dc79639ed8 100644 --- a/src/Gui/Controls/IComboBox.cs +++ b/src/Gui/Controls/IComboBox.cs @@ -34,8 +34,8 @@ public interface IComboBox : IControl object? DataSource { get; set; } IList Items { get; } int SelectedIndex { get; set; } - object SelectedItem { get; set; } - object SelectedValue { get; set; } + object? SelectedItem { get; set; } + object? SelectedValue { get; set; } string Text { get; set; } } } diff --git a/src/UserInterfaces/AvaloniaUI/Controls/TextView.cs b/src/UserInterfaces/AvaloniaUI/Controls/TextView.cs index 3004d6f4a6..31ee6b93e5 100644 --- a/src/UserInterfaces/AvaloniaUI/Controls/TextView.cs +++ b/src/UserInterfaces/AvaloniaUI/Controls/TextView.cs @@ -110,7 +110,7 @@ public TextView() { this.Selection = new TextSelection(this); this.model = new EmptyEditorModel(); - this.styleStack = new StyleStack(); + this.styleStack = default!; } event EventHandler? ILogicalScrollable.ScrollInvalidated diff --git a/src/UserInterfaces/WindowsForms/Forms/FindStringsDialog.cs b/src/UserInterfaces/WindowsForms/Forms/FindStringsDialog.cs index 8378b602e4..2c13d1958c 100644 --- a/src/UserInterfaces/WindowsForms/Forms/FindStringsDialog.cs +++ b/src/UserInterfaces/WindowsForms/Forms/FindStringsDialog.cs @@ -35,7 +35,7 @@ public FindStringsDialog() InitializeComponent(); } - public FindStringsDialogInteractor DataContext + public new FindStringsDialogInteractor DataContext { get => interactor; set diff --git a/src/UserInterfaces/WindowsForms/SearchResultServiceImpl.cs b/src/UserInterfaces/WindowsForms/SearchResultServiceImpl.cs index 782e597249..fc4db66448 100644 --- a/src/UserInterfaces/WindowsForms/SearchResultServiceImpl.cs +++ b/src/UserInterfaces/WindowsForms/SearchResultServiceImpl.cs @@ -158,13 +158,14 @@ public void Advance(int distance) if (itemCount < 2) return; int i; - if (listView.FocusedItem == null) + var tag = listView.FocusedItem?.Tag; + if (tag is null) { i = 0; } else { - i = ((int) listView.FocusedItem.Tag + itemCount + distance) % itemCount; + i = ((int) tag + itemCount + distance) % itemCount; } listView.SelectedIndices.Clear(); listView.SelectedIndices.Add(i); @@ -175,9 +176,10 @@ public void Advance(int distance) void listView_DoubleClick(object? sender, EventArgs e) { - if (listView.FocusedItem == null) + var tag = listView.FocusedItem?.Tag; + if (tag is null) return; - DoubleClickItem((int)listView.FocusedItem.Tag); + DoubleClickItem((int) tag); } private class SearchResultView : ISearchResultView @@ -221,7 +223,7 @@ public void Invalidate() { var i = listView.TopItem; if (i is null) - return null; + return Task.FromResult(null); return typeMarker.ShowAsync(program, addr, i.Position); } } diff --git a/src/UserInterfaces/WindowsForms/ToolStripComboBoxWrapper.cs b/src/UserInterfaces/WindowsForms/ToolStripComboBoxWrapper.cs index 635f46da12..1fa0c58979 100644 --- a/src/UserInterfaces/WindowsForms/ToolStripComboBoxWrapper.cs +++ b/src/UserInterfaces/WindowsForms/ToolStripComboBoxWrapper.cs @@ -47,7 +47,7 @@ public int SelectedIndex set { ddl.SelectedIndex = value; } } - public object SelectedItem + public object? SelectedItem { get { return ddl.SelectedItem; } set { ddl.SelectedItem= value; }