From d866652d38d2366c333a1ff5092aff1cc4b85dfa Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 2 Jul 2018 16:27:32 +0300 Subject: Implemented Twine's catalog control, Twine's catalog viewer, Twines catalog color correction view. Added INavigationResultProvider OnNavigationObjectReceived method.. Improved navigation system history. --- .../Navigation/DefaultNavigationManager.cs | 33 +++++++++++++++------- 1 file changed, 23 insertions(+), 10 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs index c56e0f000..d26f4d396 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs @@ -26,6 +26,8 @@ namespace Tango.PPC.UI.Navigation private IPPCModuleLoader _moduleLoader; private Object _currentVM; + private String _lastFullPath; + private bool _preventHistory; private Stack _navigationHistory; @@ -71,6 +73,7 @@ namespace Tango.PPC.UI.Navigation if (view == NavigationView.HomeModule) { _navigationHistory.Clear(); + _lastFullPath = null; var firstModule = _moduleLoader.UserModules.FirstOrDefault(); var moduleAtt = firstModule.GetType().GetCustomAttribute(); @@ -142,12 +145,14 @@ namespace Tango.PPC.UI.Navigation } } - if (pushToHistory) + if (pushToHistory && _lastFullPath != null && !_preventHistory) { - _navigationHistory.Push(fullPath); + _navigationHistory.Push(_lastFullPath); RaisePropertyChanged(nameof(CanNavigateBack)); } + _lastFullPath = fullPath; + MainView.Instance.NavigationControl.NavigateTo(NavigationView.LayoutView.ToString()); var navigationControl = LayoutView.Instance.NavigationControl; CurrentModule = module; @@ -193,7 +198,7 @@ namespace Tango.PPC.UI.Navigation } } - public Task NavigateForResult(bool pushToHistory = true) + public Task NavigateForResult(TObject obj, bool pushToHistory = true) where TModule : IPPCModule { TaskCompletionSource source = new TaskCompletionSource(); @@ -204,19 +209,23 @@ namespace Tango.PPC.UI.Navigation Action handler = null; - handler = (from, to) => + handler = (from, to) => { if (toVM == null) { toVM = to; + if (toVM is INavigationResultProvider) + { + (toVM as INavigationResultProvider).OnNavigationObjectReceived(obj); + } } else { if (to == fromVM && from == toVM) { - if (from is INavigationResultProvider) + if (from is INavigationResultProvider) { - source.SetResult((from as INavigationResultProvider).GetNavigationResult()); + source.SetResult((from as INavigationResultProvider).GetNavigationResult()); } } @@ -236,7 +245,7 @@ namespace Tango.PPC.UI.Navigation /// public bool CanNavigateBack { - get { return _navigationHistory.Count > 1; } + get { return _navigationHistory.Count > 0; } } /// @@ -245,16 +254,20 @@ namespace Tango.PPC.UI.Navigation public async Task NavigateBack() { String first = _navigationHistory.Pop(); - String second = _navigationHistory.Pop(); + _preventHistory = true; - if (await NavigateTo(second)) + + if (await NavigateTo(first)) { + RaisePropertyChanged(nameof(CanNavigateBack)); + _preventHistory = false; return true; } else { - _navigationHistory.Push(second); _navigationHistory.Push(first); + _preventHistory = false; + RaisePropertyChanged(nameof(CanNavigateBack)); return false; } } -- cgit v1.3.1 From 2d340ef8bbbb5a1c7f3415da704a0b83c28c07b4 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 2 Jul 2018 19:03:59 +0300 Subject: WOrking on PPC. --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 1572864 -> 1572864 bytes .../Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj | 8 ++ .../PPC/Modules/Tango.PPC.Jobs/ViewModelLocator.cs | 9 ++ .../Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs | 19 ++++ .../TwineCatalogColorCorrectionViewVM.cs | 73 +--------------- .../ViewModels/TwineCatalogViewVM.cs | 97 +++++++++++++++++++++ .../PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml | 10 +++ .../PPC/Modules/Tango.PPC.Jobs/Views/MainView.xaml | 1 + .../Tango.PPC.Jobs/Views/TwineCatalogView.xaml | 37 ++++++++ .../Tango.PPC.Jobs/Views/TwineCatalogView.xaml.cs | 28 ++++++ .../Navigation/DefaultNavigationManager.cs | 13 ++- .../Tango.Touch/Controls/LightTouchScrollViewer.cs | 7 +- .../Tango.Touch/Controls/TouchLoadingPanel.xaml | 2 +- .../Tango.Touch/Controls/TouchTextBox.cs | 36 ++++++++ .../Tango.Touch/Controls/TouchTextBox.xaml | 2 +- 16 files changed, 264 insertions(+), 78 deletions(-) create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml.cs (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 8d698a5a1..dc30dee32 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index d9c6d39ac..3c24b5a2e 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj index 100b7dcbd..935fdb77d 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj @@ -104,6 +104,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -154,6 +158,7 @@ + JobsView.xaml @@ -166,6 +171,9 @@ MainView.xaml + + TwineCatalogView.xaml + TwineCatalogColorCorrectionView.xaml diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModelLocator.cs index 17a14192e..2a0692350 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModelLocator.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModelLocator.cs @@ -19,6 +19,7 @@ namespace Tango.PPC.Jobs TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); + TangoIOC.Default.Register(); TangoIOC.Default.Register(); } @@ -66,6 +67,14 @@ namespace Tango.PPC.Jobs } } + public static TwineCatalogViewVM TwineCatalogViewVM + { + get + { + return TangoIOC.Default.GetInstance(); + } + } + public static TwineCatalogColorCorrectionViewVM TwineCatalogColorCorrectionViewVM { get diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs index 8663686c6..1c4fec382 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs @@ -160,6 +160,11 @@ namespace Tango.PPC.Jobs.ViewModels /// public RelayCommand ReplaceBrushStopCommand { get; set; } + /// + /// Gets or sets the twine catalog field tap command. + /// + public RelayCommand TwineCatalogFieldTapCommand { get; set; } + #endregion #region Constructors @@ -192,6 +197,7 @@ namespace Tango.PPC.Jobs.ViewModels RemoveJobCommand = new RelayCommand(RemoveJob); SaveJobCommand = new RelayCommand(SaveJob); ReplaceBrushStopCommand = new RelayCommand(InvokeColorAdjustmentForBrushStop); + TwineCatalogFieldTapCommand = new RelayCommand(InvokeTwineCatalogForBrushStop); } #endregion @@ -349,6 +355,19 @@ namespace Tango.PPC.Jobs.ViewModels } } + private async void InvokeTwineCatalogForBrushStop(BrushStop brushStop) + { + _can_navigate_back = true; + var catalogItem = await NavigationManager.NavigateForResult(brushStop); + _can_navigate_back = false; + + if (catalogItem != null) + { + brushStop.ColorCatalog = _db.ColorCatalogs.Single(x => x.Guid == catalogItem.Entity.Guid); + brushStop.Color = catalogItem.Color; + } + } + #endregion #region Job Selection Message diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogColorCorrectionViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogColorCorrectionViewVM.cs index 9cae25dd2..7217bd174 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogColorCorrectionViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogColorCorrectionViewVM.cs @@ -13,35 +13,8 @@ using Tango.Settings; namespace Tango.PPC.Jobs.ViewModels { - public class TwineCatalogColorCorrectionViewVM : PPCViewModel, INavigationResultProvider + public class TwineCatalogColorCorrectionViewVM : TwineCatalogViewVM { - private bool _confirmed; - - private Catalog _catalog; - public Catalog Catalog - { - get { return _catalog; } - set { _catalog = value; RaisePropertyChangedAuto(); } - } - - private Catalog _recent; - public Catalog Recent - { - get { return _recent; } - set { _recent = value; RaisePropertyChangedAuto(); } - } - - - private CatalogItem _selectedItem; - public CatalogItem SelectedItem - { - get { return _selectedItem; } - set - { - _selectedItem = value; RaisePropertyChangedAuto(); - } - } - private BrushStop _invalidBrushStop; public BrushStop InvalidBrushStop { @@ -49,49 +22,7 @@ namespace Tango.PPC.Jobs.ViewModels set { _invalidBrushStop = value; RaisePropertyChangedAuto(); } } - public RelayCommand OKCommand { get; set; } - - public TwineCatalogColorCorrectionViewVM() - { - OKCommand = new RelayCommand(Confirm); - } - - public override void OnApplicationStarted() - { - Catalog = CatalogLoader.LoadCatalog(BL.Enumerations.ColorSpaces.Twine, ObservablesEntitiesAdapter.Instance.Context); - Recent = CatalogLoader.GetRecent(Catalog, SettingsManager.Default.GetOrCreate().RecentTwineCatalogColors); - } - - public override void OnNavigatedTo() - { - SelectedItem = null; - base.OnNavigatedTo(); - _confirmed = false; - } - - private void Confirm() - { - SettingsManager.Default.GetOrCreate().RecentTwineCatalogColors.Add(SelectedItem.Entity.Guid); - SettingsManager.Default.Save(); - Recent = CatalogLoader.GetRecent(Catalog, SettingsManager.Default.GetOrCreate().RecentTwineCatalogColors); - - _confirmed = true; - NavigationManager.NavigateBack(); - } - - public CatalogItem GetNavigationResult() - { - if (_confirmed) - { - return SelectedItem; - } - else - { - return null; - } - } - - public void OnNavigationObjectReceived(BrushStop brushStop) + public override void OnNavigationObjectReceived(BrushStop brushStop) { InvalidBrushStop = brushStop; } diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs new file mode 100644 index 000000000..2b7a24ab8 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs @@ -0,0 +1,97 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL; +using Tango.BL.Catalogs; +using Tango.BL.Entities; +using Tango.Core.Commands; +using Tango.PPC.Common; +using Tango.PPC.Common.Navigation; +using Tango.Settings; + +namespace Tango.PPC.Jobs.ViewModels +{ + public class TwineCatalogViewVM : PPCViewModel, INavigationResultProvider + { + private bool _confirmed; + + private Catalog _catalog; + public Catalog Catalog + { + get { return _catalog; } + set { _catalog = value; RaisePropertyChangedAuto(); } + } + + private Catalog _recent; + public Catalog Recent + { + get { return _recent; } + set { _recent = value; RaisePropertyChangedAuto(); } + } + + private CatalogItem _selectedItem; + public CatalogItem SelectedItem + { + get { return _selectedItem; } + set + { + _selectedItem = value; RaisePropertyChangedAuto(); + } + } + + public RelayCommand OKCommand { get; set; } + + public TwineCatalogViewVM() + { + OKCommand = new RelayCommand(Confirm); + } + + public override void OnApplicationStarted() + { + Catalog = CatalogLoader.LoadCatalog(BL.Enumerations.ColorSpaces.Twine, ObservablesEntitiesAdapter.Instance.Context); + Recent = CatalogLoader.GetRecent(Catalog, SettingsManager.Default.GetOrCreate().RecentTwineCatalogColors); + } + + public override void OnNavigatedTo() + { + base.OnNavigatedTo(); + _confirmed = false; + } + + private void Confirm() + { + SettingsManager.Default.GetOrCreate().RecentTwineCatalogColors.Add(SelectedItem.Entity.Guid); + SettingsManager.Default.Save(); + Recent = CatalogLoader.GetRecent(Catalog, SettingsManager.Default.GetOrCreate().RecentTwineCatalogColors); + + _confirmed = true; + NavigationManager.NavigateBack(); + } + + public CatalogItem GetNavigationResult() + { + if (_confirmed) + { + return SelectedItem; + } + else + { + return null; + } + } + + public virtual void OnNavigationObjectReceived(BrushStop brushStop) + { + if (brushStop.ColorCatalog != null) + { + SelectedItem = Catalog.Groups.SelectMany(x => x.Items).SingleOrDefault(x => x.Entity.Guid == brushStop.ColorCatalog.Guid); + } + else + { + SelectedItem = null; + } + } + } +} diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml index 610d3f61f..a55e5a7d3 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml @@ -52,6 +52,10 @@ + + + + @@ -248,6 +252,9 @@ + + + @@ -375,6 +382,9 @@ + + + diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/MainView.xaml index e2ab2c26f..6de05b01b 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/MainView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/MainView.xaml @@ -15,6 +15,7 @@ + diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml new file mode 100644 index 000000000..3a29c3dd2 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml @@ -0,0 +1,37 @@ + + + + + + + + + + Twine Catalog + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml.cs new file mode 100644 index 000000000..57600322f --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Tango.PPC.Jobs.Views +{ + /// + /// Interaction logic for TwineCatalogColorCorrectionView.xaml + /// + public partial class TwineCatalogView : UserControl + { + public TwineCatalogView() + { + InitializeComponent(); + } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs index d26f4d396..448fc0edc 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs @@ -171,11 +171,18 @@ namespace Tango.PPC.UI.Navigation await Task.Delay(100); var v = moduleNavigation.NavigateTo(view); - _currentVM = v.DataContext; + if (v != null) + { + _currentVM = v.DataContext; - if (view != path.Last()) + if (view != path.Last()) + { + moduleNavigation = v.FindChildOffline(); + } + } + else { - moduleNavigation = v.FindChildOffline(); + throw new ArgumentNullException("Could not navigate to " + fullPath); } } diff --git a/Software/Visual_Studio/Tango.Touch/Controls/LightTouchScrollViewer.cs b/Software/Visual_Studio/Tango.Touch/Controls/LightTouchScrollViewer.cs index 9840a6fd8..eb60565a5 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/LightTouchScrollViewer.cs +++ b/Software/Visual_Studio/Tango.Touch/Controls/LightTouchScrollViewer.cs @@ -33,7 +33,7 @@ namespace Tango.Touch.Controls private DateTime _current_move_time; private double _current_move_delta; private double _last_move_delta; - private const double _min_move_delta = 5; + private const double _min_move_delta = 10; private const double _delta_measure_interval_milli = 10; private const double _friction_factor_per_second = 0.9; private DispatcherTimer _move_timer; @@ -559,6 +559,9 @@ namespace Tango.Touch.Controls if (IsScrolling) { + double max_move_delta = 120; + double strengh = Math.Abs(_current_move_delta) / max_move_delta; + Debug.WriteLine((DateTime.Now - _current_move_time).TotalMilliseconds); Debug.WriteLine("MOVE DELTA: " + _current_move_delta); //Emulate inertia @@ -579,7 +582,7 @@ namespace Tango.Touch.Controls double to = _grid_content.Margin.Top + (pixels_per_second) / 100; _grid_content.Margin = new Thickness(0, to, 0, 0); - if (DateTime.Now > cur_time.AddMilliseconds(300)) + if (DateTime.Now > cur_time.AddMilliseconds(500 * strengh)) { pixels_per_second *= _friction_factor_per_second; diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchLoadingPanel.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchLoadingPanel.xaml index d4c0c3d80..4a4cdbba2 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchLoadingPanel.xaml +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchLoadingPanel.xaml @@ -45,7 +45,7 @@ - + diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.cs index b70750286..d5ecdfdeb 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.cs +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.cs @@ -12,6 +12,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; +using Tango.Core.EventArguments; using Tango.Touch.Keyboard; namespace Tango.Touch.Controls @@ -44,6 +45,31 @@ namespace Tango.Touch.Controls public static readonly DependencyProperty IsPasswordProperty = DependencyProperty.Register("IsPassword", typeof(bool), typeof(TouchTextBox), new PropertyMetadata(false)); + public bool IsReadOnly + { + get { return (bool)GetValue(IsReadOnlyProperty); } + set { SetValue(IsReadOnlyProperty, value); } + } + public static readonly DependencyProperty IsReadOnlyProperty = + DependencyProperty.Register("IsReadOnly", typeof(bool), typeof(TouchTextBox), new PropertyMetadata(false)); + + public ICommand TapCommand + { + get { return (ICommand)GetValue(TapCommandProperty); } + set { SetValue(TapCommandProperty, value); } + } + public static readonly DependencyProperty TapCommandProperty = + DependencyProperty.Register("TapCommand", typeof(ICommand), typeof(TouchTextBox), new PropertyMetadata(null)); + + public Object TapCommandParameter + { + get { return (Object)GetValue(TapCommandParameterProperty); } + set { SetValue(TapCommandParameterProperty, value); } + } + public static readonly DependencyProperty TapCommandParameterProperty = + DependencyProperty.Register("TapCommandParameter", typeof(Object), typeof(TouchTextBox), new PropertyMetadata(null)); + + static TouchTextBox() { DefaultStyleKeyProperty.OverrideMetadata(typeof(TouchTextBox), new FrameworkPropertyMetadata(typeof(TouchTextBox))); @@ -56,6 +82,16 @@ namespace Tango.Touch.Controls _text_box = GetTemplateChild("PART_TextBox") as TextBox; _text_box.GotFocus += _text_box_GotFocus; + + this.RegisterForPreviewMouseOrTouchUp(OnMouseOrTouchUp); + } + + private void OnMouseOrTouchUp(object sender, MouseOrTouchEventArgs e) + { + if (TapCommand != null) + { + TapCommand.Execute(TapCommandParameter); + } } private async void _text_box_GotFocus(object sender, RoutedEventArgs e) diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml index 715705a87..da999385f 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml @@ -102,7 +102,7 @@ - + -- cgit v1.3.1