diff --git a/src/Calculator/Controls/CalculationResult.cpp b/src/Calculator/Controls/CalculationResult.cpp index 9c9d578..3220e31 100644 --- a/src/Calculator/Controls/CalculationResult.cpp +++ b/src/Calculator/Controls/CalculationResult.cpp @@ -377,7 +377,16 @@ void CalculationResult::OnTapped(TappedRoutedEventArgs ^ e) void CalculationResult::OnRightTapped(RightTappedRoutedEventArgs ^ e) { - this->Focus(::FocusState::Programmatic); + auto requestedElement = e->OriginalSource; + + if (requestedElement->Equals(dynamic_cast(m_textBlock))) + { + m_textBlock->Focus(::FocusState::Programmatic); + } + else + { + this->Focus(::FocusState::Programmatic); + } } void CalculationResult::OnGotFocus(RoutedEventArgs ^ e)