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

fixes misc TODO items

Browse source
This commit is contained in:
tian-lt 2021-06-02 17:47:38 +08:00
commit c6cbca004a
9 changed files with 14 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/CalcViewModel/Common/DisplayExpressionToken.h
View file

@ -33,6 +33,7 @@ public
OBSERVABLE_PROPERTY_RW(int, TokenPosition);
OBSERVABLE_PROPERTY_RW(bool, IsTokenEditable);
OBSERVABLE_PROPERTY_RW(int, CommandIndex);
OBSERVABLE_PROPERTY_RW(TokenType, Type);
OBSERVABLE_PROPERTY_R(Platform::String ^, OriginalToken);
property bool IsTokenInEditMode
@ -51,10 +52,6 @@ public
}
}
// CSHARP_MIGRATION: TODO: this property has been changed from Internal to Public
// double check if this change is reasonable
OBSERVABLE_PROPERTY_RW(TokenType, Type);
private:
bool m_InEditMode;
};

4
src/CalcViewModel/StandardCalculatorViewModel.h
View file

@ -245,13 +245,13 @@ namespace CalculatorApp
void SendCommandToCalcManager(int command);
public:
// CSHARP_MIGRATION: TODO: check if these still need to be internal
// Memory feature related methods. They are internal because they need to called from the MainPage code-behind
// Memory feature related methods.
void OnMemoryButtonPressed();
void OnMemoryItemPressed(Platform::Object ^ memoryItemPosition);
void OnMemoryAdd(Platform::Object ^ memoryItemPosition);
void OnMemorySubtract(Platform::Object ^ memoryItemPosition);
void OnMemoryClear(_In_ Platform::Object ^ memoryItemPosition);
void SelectHistoryItem(HistoryItemViewModel ^ item);
void SwitchProgrammerModeBase(CalculatorApp::ViewModel::Common::NumberBase calculatorBase);
void SetBitshiftRadioButtonCheckedAnnouncement(Platform::String ^ announcement);

10
src/CalcViewModel/UnitConverterViewModel.h
View file

@ -75,7 +75,6 @@ namespace CalculatorApp
return AccessibleName;
}
// CSHARP_MIGRATION: TODO:
public:
bool IsModelUnitWhimsical()
{
@ -87,7 +86,8 @@ namespace CalculatorApp
return m_original.id;
}
internal : const UnitConversionManager::Unit& GetModelUnit() const
internal:
const UnitConversionManager::Unit& GetModelUnit() const
{
return m_original;
}
@ -98,23 +98,21 @@ namespace CalculatorApp
[Windows::UI::Xaml::Data::Bindable] public ref class SupplementaryResult sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged
{
internal : SupplementaryResult(Platform::String ^ value, Unit ^ unit)
internal:
SupplementaryResult(Platform::String ^ value, Unit ^ unit)
: m_Value(value)
, m_Unit(unit)
{
}
// CSHARP_MIGRATION: TODO: double check below method's accessor
public:
bool IsWhimsical()
{
return m_Unit->GetModelUnit().isWhimsical;
}
public:
Platform::String ^ GetLocalizedAutomationName();
public:
OBSERVABLE_OBJECT();
OBSERVABLE_PROPERTY_R(Platform::String ^, Value);

2
src/Calculator/App.xaml.cs
View file

@ -402,14 +402,12 @@ namespace CalculatorApp
{
try
{
// CSHARP_MIGRATION: TODO:
var calculatorOptions = NavCategoryGroup.CreateCalculatorCategory();
var jumpList = await JumpList.LoadCurrentAsync();
jumpList.SystemGroupKind = JumpListSystemGroupKind.None;
jumpList.Items.Clear();
// CSHARP_MIGRATION: TODO:
foreach (NavCategory option in calculatorOptions.Categories)
{
if (!option.IsEnabled)

6
src/Calculator/Common/KeyboardShortcuManager.cs
View file

@ -617,7 +617,7 @@ namespace CalculatorApp
}
var buttons = EqualRange(lookupMap, (MyVirtualKey)key);
var navView = buttons.ElementAt(0).Target as MUXC.NavigationView; // CSHARP_MIGRATION: TODO: double check if button[0] exists
var navView = buttons.ElementAt(0).Target as MUXC.NavigationView;
var appViewModel = (navView.DataContext as ApplicationViewModel);
appViewModel.Mode = ViewMode.Date;
var categoryName = AppResourceProvider.GetInstance().GetResourceString("DateCalculationModeText");
@ -656,7 +656,7 @@ namespace CalculatorApp
}
var buttons = EqualRange(lookupMap, (MyVirtualKey)myVirtualKey);
if (buttons.Count() <= 0) // CSHARP_MIGRATION: TODO: double check if this is equivalent to `if (buttons.first == buttons.second)`
if (buttons.Count() <= 0)
{
return;
}
@ -710,7 +710,7 @@ namespace CalculatorApp
var item = itemRef.Target as MUXC.NavigationView;
if (item != null)
{
var navView = item as MUXC.NavigationView; // CSHARP_MIGRATION: TODO: check if this line is still needed
var navView = (MUXC.NavigationView)item;
var menuItems = ((ObservableCollection<object>)navView.MenuItemsSource);
if (menuItems != null)

2
src/Calculator/Views/Calculator.xaml.cs
View file

@ -458,8 +458,6 @@ namespace CalculatorApp
{
ScientificAngleButtons.IsErrorVisualState = isError;
}
// CSHARP_MIGRATION: TODO:
// ScientificAngleButtons works but ProgrammerDisplayPanel doesn't
else if (IsProgrammer && ProgrammerDisplayPanel != null)
{
ProgrammerDisplayPanel.IsErrorVisualState = isError;

3
src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cs
View file

@ -227,9 +227,6 @@ namespace CalculatorApp
}
m_updatingCheckedStates = true;
// CSHARP_MIGRATION:
// iterator and index move at the same time with same step
// add index validation in the loop
int index = 0;
bool mustUpdateTextOfMostSignificantDigits = m_currentValueBitLength != Model.ValueBitLength;
int previousMSDPosition = GetIndexOfLastBit(m_currentValueBitLength);

2
src/Calculator/Views/DateCalculator.xaml.cs
View file

@ -223,8 +223,6 @@ namespace CalculatorApp
RaiseLiveRegionChangedAutomationEvent(false);
}
// CSHARP_MIGRATION: TODO:
// can we change the calendarDatePicker.Date of in arg?
private void ReselectCalendarDate(CalendarDatePicker calendarDatePicker, DateTimeOffset? dateTime)
{
// Reselect the unselected Date

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

@ -116,7 +116,7 @@ namespace CalculatorApp
public ObservableCollection<object> CreateUIElementsForCategories(IObservableVector<NavCategoryGroup> categories)
{
var menuCategories = new ObservableCollection<object>(); // CSHARP_MIGRATION: TODO: Check if ObservableCollection fits here
var menuCategories = new ObservableCollection<object>();
foreach (var group in categories)
{