[BUG] Fix not scrolled to searched item (#398), version 1.2.9.18

Hofknecht · Jun 11, 2022 · 7afcb95 · 7afcb95
1 parent f5b29b4
commit 7afcb95
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Business/Menus.cs b/Business/Menus.cs
@@ -77,7 +77,6 @@ void LoadMainMenuCompleted(object sender, RunWorkerCompletedEventArgs e)
                     }
 
                     AsEnumerable.ToList().ForEach(m => { m.ShowWithFade(); });
-                    menus[0].ResetSearchText();
                 }
                 else
                 {
@@ -1028,8 +1027,7 @@ private void MenuVisibleChanged(object sender, EventArgs e)
 
                 if (menu.Level == 0)
                 {
-                    DataGridView dgv = menu.GetDataGridView();
-                    ((DataTable)dgv.DataSource).DefaultView.RowFilter = "[SortIndex] LIKE '%0%'";
+                    menu.ResetSearchText();
                     AdjustMenusSizeAndLocation();
                 }
             }

diff --git a/Business/WaitToLoadMenu.cs b/Business/WaitToLoadMenu.cs
@@ -191,7 +191,11 @@ private void SetData(DataGridView dgv, int rowIndex)
             this.dgv = dgv;
             this.rowIndex = rowIndex;
             RowData rowData = (RowData)dgv.Rows[rowIndex].Cells[2].Value;
-            rowData.IsSelected = true;
+            if (rowData != null)
+            {
+                rowData.IsSelected = true;
+            }
+
             dgv.Rows[rowIndex].Selected = false;
             dgv.Rows[rowIndex].Selected = true;
         }

diff --git a/UserInterface/Menu.cs b/UserInterface/Menu.cs
@@ -234,6 +234,8 @@ protected override CreateParams CreateParams
         internal void ResetSearchText()
         {
             textBoxSearch.Text = string.Empty;
+            dgv.FirstDisplayedScrollingRowIndex = 0;
+            AdjustScrollbar();
         }
 
         internal void FocusTextBox()