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

Prevent the history panel to be displayed when using the Programmer mode (#676)

Browse Source 
Be sure we don't display the panel when the current view is the Programmer mode.

Fixes #665
This commit is contained in:
Rudy Huyn 2019-09-20 16:29:45 -07:00 committed by Howard Wolosky
parent c4fe87a118
commit 80912a33d0
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -554,21 +554,21 @@ void Calculator::SetDefaultFocus()
void Calculator::ToggleHistoryFlyout(Object ^ /*parameter*/)
{
String ^ viewState = App::GetAppViewState();
// If app starts correctly in snap mode and shortcut is used for history then we need to load history if not yet initialized.
if (viewState != ViewState::DockedView)
if (Model->IsProgrammer || App::GetAppViewState() == ViewState::DockedView)
{
if (m_fIsHistoryFlyoutOpen)
{
HistoryFlyout->Hide();
}
else
{
HistoryFlyout->Content = m_historyList;
m_historyList->RowHeight = NumpadPanel->ActualHeight;
FlyoutBase::ShowAttachedFlyout(HistoryButton);
}
return;
}
if (m_fIsHistoryFlyoutOpen)
{
HistoryFlyout->Hide();
}
else
{
HistoryFlyout->Content = m_historyList;
m_historyList->RowHeight = NumpadPanel->ActualHeight;
FlyoutBase::ShowAttachedFlyout(HistoryButton);
}
}
void Calculator::ToggleMemoryFlyout()