Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,12 @@ private void LayoutItem_Click(object sender, MouseButtonEventArgs e)

private void LayoutItem_Focused(object sender, RoutedEventArgs e)
{
// Ignore focus on Edit button click
if (e.Source is Button)
{
return;
}

Select(((Border)sender).DataContext as LayoutModel);
}

Expand Down Expand Up @@ -211,7 +217,7 @@ private void DeleteLayout_Click(object sender, RoutedEventArgs e)
private async void EditLayout_Click(object sender, RoutedEventArgs e)
{
var dataContext = ((FrameworkElement)sender).DataContext;
_settings.SetSelectedModel((LayoutModel)dataContext);
Select((LayoutModel)dataContext);

if (_settings.SelectedModel is GridLayoutModel grid)
{
Expand Down