Working on PPC!!!

1 files changed, 4 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.cs
index affc0a2a0..a591f9748 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.cs
@@ -9,6 +9,7 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using Tango.Core.Commands;
 using Tango.Core.EventArguments;
+using Tango.Touch.Keyboard;
 
 namespace Tango.Touch.Controls
 {
@@ -35,6 +36,9 @@ namespace Tango.Touch.Controls
 
         private void OnMouseDown(object sender, MouseOrTouchEventArgs e)
         {
+            var element = e.OriginalSource as FrameworkElement;
+            if (element.Focusable) return;
+
             Focus(); //TODO: Notice that this does not cause trouble. (Originally inserted for stealing focus from pop-ups)
         }