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

hide history button in programmer mode (#327)

Browse Source 
Description of the changes:
  Hide the History button when in Programmer mode via VisualState

How changes were validated:
  Open Standard mode
  Switch to Programmer mode
  Verify that the History button isn't visible

Fixes #326
This commit is contained in:
Rudy Huyn 2019-03-18 14:22:44 -07:00 committed by Howard Wolosky
parent 62b2fafdd0
commit 21e15c426e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -515,6 +515,7 @@
<Setter Target="M5.MaxWidth" Value="80"/> <Setter Target="M5.MaxWidth" Value="80"/>
<Setter Target="memButton.(Grid.Column)" Value="5"/> <Setter Target="memButton.(Grid.Column)" Value="5"/>
<Setter Target="MemoryButton.(Grid.Column)" Value="6"/> <Setter Target="MemoryButton.(Grid.Column)" Value="6"/>
<Setter Target="HistoryButton.Visibility" Value="Collapsed"/>
</VisualState.Setters> </VisualState.Setters>
<Storyboard Completed="OnStoryboardCompleted"/> <Storyboard Completed="OnStoryboardCompleted"/>
</VisualState> </VisualState>

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

@ -415,7 +415,7 @@ void Calculator::UpdateHistoryState()
SetChildAsHistory(); SetChildAsHistory();
HistoryButton->Visibility = ::Visibility::Collapsed; HistoryButton->Visibility = ::Visibility::Collapsed;
if (m_IsLastFlyoutHistory) if (!IsProgrammer && m_IsLastFlyoutHistory)
{ {
DockPivot->SelectedIndex = 0; DockPivot->SelectedIndex = 0;
} }
@ -522,7 +522,7 @@ void Calculator::HistoryFlyout_Closed(_In_ Object ^sender, _In_ Object ^args)
AutomationProperties::SetName(HistoryButton, m_openHistoryFlyoutAutomationName); AutomationProperties::SetName(HistoryButton, m_openHistoryFlyoutAutomationName);
m_fIsHistoryFlyoutOpen = false; m_fIsHistoryFlyoutOpen = false;
EnableControls(true); EnableControls(true);
if (HistoryButton->IsEnabled) if (HistoryButton->IsEnabled && HistoryButton->Visibility == ::Visibility::Visible)
{ {
HistoryButton->Focus(::FocusState::Programmatic); HistoryButton->Focus(::FocusState::Programmatic);
} }