github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 14:13:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a style problem of Date Calculator, and clean some unused codes

Browse source
This commit is contained in:
Kenny Guo 2021-07-21 18:51:59 +08:00
commit 323526bb2a
2 changed files with 922 additions and 995 deletions
Download patch file Download diff file Expand all files Collapse all files

1901
src/Calculator/Views/DateCalculator.xaml
View file

File diff suppressed because it is too large Load diff

16
src/Calculator/Views/MainPage.xaml.cs
View file

@ -9,7 +9,6 @@ using System.Collections.ObjectModel;
using System.ComponentModel;
using Windows.Foundation;
using Windows.Foundation.Collections;
using Windows.Foundation.Metadata;
using Windows.Graphics.Display;
using Windows.Storage;
using Windows.UI.Core;
@ -19,8 +18,6 @@ using Windows.UI.Xaml.Automation;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Controls.Primitives;
using Windows.UI.Xaml.Data;
using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Navigation;
using MUXC = Microsoft.UI.Xaml.Controls;
@ -272,9 +269,6 @@ namespace CalculatorApp
}
// Special case logic for Ctrl+E accelerator for Date Calculation Mode
NavView.SetValue(KeyboardShortcutManager.VirtualKeyControlChordProperty, MyVirtualKey.E);
// Special case logic for Settings button access key.
SetSettingsButtonAccessKey(NavView);
}
private void OnNavPaneOpened(MUXC.NavigationView sender, object args)
@ -594,16 +588,6 @@ namespace CalculatorApp
return !isAlwaysOnTop && isPopupOpen ? Visibility.Visible : Visibility.Collapsed;
}
private static void SetSettingsButtonAccessKey(MUXC.NavigationView navView)
{
var settingsItem = navView.SettingsItem as MUXC.NavigationViewItem;
if (settingsItem != null)
{
settingsItem.AccessKey = ",";
settingsItem.KeyTipPlacementMode = Windows.UI.Xaml.Input.KeyTipPlacementMode.Right;
}
}
private CalculatorApp.Calculator m_calculator;
private GraphingCalculator m_graphingCalculator;
private CalculatorApp.UnitConverter m_converter;