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

hide history button in programmer mode

Browse source
This commit is contained in:
Rudy Huyn 2019-03-18 09:32:04 -07:00
commit d1e733db3a
2 changed files with 3 additions and 2 deletions
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);
} }