From 51c4845f88fcdbcb0a9799e4d2c885d732b6f869 Mon Sep 17 00:00:00 2001
From: svsrk praveen <sk.sk.praveen@gmail.com>
Date: Wed, 9 Oct 2019 20:09:55 +0530
Subject: [PATCH] Fix the focus when right-clicking CalculationResult's
 TextBlock (#698)

* Fixed issue with focus when right-clicking result

* Using dynamic_cast in place of safe_cast
---
 src/Calculator/Controls/CalculationResult.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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<Object ^>(m_textBlock)))
+    {
+        m_textBlock->Focus(::FocusState::Programmatic);
+    }
+    else
+    {
+        this->Focus(::FocusState::Programmatic);
+    }
 }
 
 void CalculationResult::OnGotFocus(RoutedEventArgs ^ e)