From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001 From: Mirta Date: Wed, 30 Dec 2020 16:39:52 +0200 Subject: merge --- .../Controls/TouchVirtualizedContentControl.cs | 28 ++++++++++------------ 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'Software/Visual_Studio/Tango.Touch/Controls/TouchVirtualizedContentControl.cs') diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchVirtualizedContentControl.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchVirtualizedContentControl.cs index bb9f260c0..72bb7dd06 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchVirtualizedContentControl.cs +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchVirtualizedContentControl.cs @@ -128,30 +128,26 @@ namespace Tango.Touch.Controls Rect bounds = new Rect(_location.X, _location.Y, ActualWidth, ActualHeight); Rect rect = new Rect(0.0, _scrollViewer.GetScrollPosition(), _border_viewport.ActualWidth, _border_viewport.ActualHeight); - - if (_innerBorder != null) + if (bounds.IntersectsWith(rect)) { - if (bounds.IntersectsWith(rect)) + if (_innerBorder.Visibility == Visibility.Hidden) { - if (_innerBorder.Visibility == Visibility.Hidden) + //Debug.WriteLine("Visible"); + Dispatcher.BeginInvoke(new Action(() => { - //Debug.WriteLine("Visible"); - Dispatcher.BeginInvoke(new Action(() => - { - _innerBorder.Visibility = Visibility.Visible; - }), DispatcherPriority.Background); - } + _innerBorder.Visibility = Visibility.Visible; + }), DispatcherPriority.Background); } - else + } + else + { + if (_innerBorder.Visibility == Visibility.Visible) { - if (_innerBorder.Visibility == Visibility.Visible) + Dispatcher.BeginInvoke(new Action(() => { - Dispatcher.BeginInvoke(new Action(() => - { //Debug.WriteLine("Hidden"); _innerBorder.Visibility = Visibility.Hidden; - }), DispatcherPriority.Background); - } + }), DispatcherPriority.Background); } } } -- cgit v1.3.1