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

Merge master into feature/GraphingCalculator branch (#660)

Browse source
This commit is contained in:
Pepe Rivera 2019-09-05 15:01:12 -07:00 • committed by GitHub
parent 1c9755d38a
commit 41fbcfe9c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
199 changed files with 5809 additions and 2925 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CalcViewModel/HistoryViewModel.cpp
View file

@ -118,6 +118,9 @@ void HistoryViewModel::SetCalculatorDisplay(CalculatorDisplay& calculatorDisplay
void HistoryViewModel::ShowItem(_In_ HistoryItemViewModel ^ e)
{
unsigned int index;
Items->IndexOf(e, &index);
TraceLogger::GetInstance().LogHistoryItemLoad((ViewMode)m_currentMode, ItemSize, (int)(index));
HistoryItemClicked(e);
}
@ -149,7 +152,6 @@ void HistoryViewModel::OnHideCommand(_In_ Platform::Object ^ e)
void HistoryViewModel::OnClearCommand(_In_ Platform::Object ^ e)
{
TraceLogger::GetInstance().LogClearHistory();
if (AreHistoryShortcutsEnabled == true)
{
m_calculatorManager->ClearHistory();