Skip to content

Commit 6f0a1d7

Browse files
committed
Unregister load event handlers in view code behinds
This is done in Rename-, MoveMultipleToFolder- and Move MultipleFoldersView. Also addresses one more review comment to PR #5438.
1 parent ff1c5f6 commit 6f0a1d7

File tree

4 files changed

+31
-20
lines changed

4 files changed

+31
-20
lines changed

Rubberduck.Core/UI/Command/Refactorings/CodePaneRefactorMoveContainingFolderCommand.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ private bool SpecializedEvaluateCanExecute(object parameter)
2929
{
3030
var target = GetTarget();
3131

32-
return target != null
33-
&& target is ModuleDeclaration
32+
return target is ModuleDeclaration
3433
&& !_state.IsNewOrModified(target.QualifiedModuleName);
3534
}
3635

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Rubberduck.Refactorings;
1+
using System.Windows;
2+
using Rubberduck.Refactorings;
23
using Rubberduck.Refactorings.MoveFolder;
34

45
namespace Rubberduck.UI.Refactorings.MoveFolder
@@ -9,11 +10,14 @@ public MoveMultipleFoldersView()
910
{
1011
InitializeComponent();
1112

12-
Loaded += (o, e) =>
13-
{
14-
MoveToFolderTextBox.Focus();
15-
MoveToFolderTextBox.SelectAll();
16-
};
13+
Loaded += AfterLoadHandler;
14+
}
15+
16+
private void AfterLoadHandler(object sender, RoutedEventArgs e)
17+
{
18+
MoveToFolderTextBox.Focus();
19+
MoveToFolderTextBox.SelectAll();
20+
Loaded -= AfterLoadHandler;
1721
}
1822
}
1923
}
Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Rubberduck.Refactorings;
1+
using System.Windows;
2+
using Rubberduck.Refactorings;
23
using Rubberduck.Refactorings.MoveToFolder;
34

45
namespace Rubberduck.UI.Refactorings.MoveToFolder
@@ -9,11 +10,14 @@ public MoveMultipleToFolderView()
910
{
1011
InitializeComponent();
1112

12-
Loaded += (o, e) =>
13-
{
14-
MoveToFolderTextBox.Focus();
15-
MoveToFolderTextBox.SelectAll();
16-
};
13+
Loaded += AfterLoadHandler;
14+
}
15+
16+
private void AfterLoadHandler(object sender, RoutedEventArgs e)
17+
{
18+
MoveToFolderTextBox.Focus();
19+
MoveToFolderTextBox.SelectAll();
20+
Loaded -= AfterLoadHandler;
1721
}
1822
}
1923
}
Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Rubberduck.Refactorings;
1+
using System.Windows;
2+
using Rubberduck.Refactorings;
23
using Rubberduck.Refactorings.Rename;
34

45
namespace Rubberduck.UI.Refactorings.Rename
@@ -9,11 +10,14 @@ public RenameView()
910
{
1011
InitializeComponent();
1112

12-
Loaded += (o, e) =>
13-
{
14-
RenameTextBox.Focus();
15-
RenameTextBox.SelectAll();
16-
};
13+
Loaded += AfterLoadHandler;
14+
}
15+
16+
private void AfterLoadHandler(object sender, RoutedEventArgs e)
17+
{
18+
RenameTextBox.Focus();
19+
RenameTextBox.SelectAll();
20+
Loaded -= AfterLoadHandler;
1721
}
1822
}
1923
}

0 commit comments

Comments
 (0)