DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fully separate Calculator and CalcManager (#752)

Browse Source
This commit is contained in:
Rudy Huyn
2019-11-06 15:31:57 -08:00
committed by Eric Wong
parent be68e72a9a
commit 5df3016df6
5 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Calculator/Views/Calculator.xaml.cpp
View File

@@ -470,11 +470,7 @@ void Calculator::OnHideHistoryClicked()
void Calculator::OnHistoryItemClicked(_In_ HistoryItemViewModel ^ e)
{
assert(e->GetTokens() != nullptr);
Model->SetHistoryExpressionDisplay(e->GetTokens(), e->GetCommands());
Model->SetExpressionDisplay(e->GetTokens(), e->GetCommands());
Model->SetPrimaryDisplay(e->Result, false);
Model->IsFToEEnabled = false;
Model->SelectHistoryItem(e);
CloseHistoryFlyout();
this->Focus(::FocusState::Programmatic);
@@ -717,3 +713,4 @@ void Calculator::Calculator_SizeChanged(Object ^ /*sender*/, SizeChangedEventArg
AlwaysOnTopResults->UpdateScrollButtons();
}
}

1
src/Calculator/Views/Calculator.xaml.h
View File

@@ -69,7 +69,6 @@ public
void CloseMemoryFlyout();
void SetDefaultFocus();
private:
void OnLoaded(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);