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

Hide or Disable graphing calculator menu item when necessary (#848)

Browse Source
This commit is contained in:
Rudy Huyn
2019-12-06 15:03:07 -08:00
committed by GitHub
parent 81747a0a93
commit 503831895d
8 changed files with 369 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Calculator/Resources/en-US/Resources.resw
View File

@@ -3163,10 +3163,6 @@
<value>AB</value>
<comment>AccessKey for the About button. {StringCategory="Accelerator"}</comment>
</data>
<data name="DateCalculationModeAccessKey" xml:space="preserve">
<value>4</value>
<comment>AccessKey for the Date Calculation mode navbar item. {StringCategory="Accelerator"}</comment>
</data>
<data name="HistoryButton.AccessKey" xml:space="preserve">
<value>I</value>
<comment>Access key for the History button. {StringCategory="Accelerator"}</comment>
@@ -3179,18 +3175,6 @@
<value>H</value>
<comment>Access key for the Hamburger button. {StringCategory="Accelerator"}</comment>
</data>
<data name="ProgrammerModeAccessKey" xml:space="preserve">
<value>3</value>
<comment>AccessKey for the Programmer mode navbar item. {StringCategory="Accelerator"}</comment>
</data>
<data name="ScientificModeAccessKey" xml:space="preserve">
<value>2</value>
<comment>AccessKey for the Scientific mode navbar item. {StringCategory="Accelerator"}</comment>
</data>
<data name="StandardModeAccessKey" xml:space="preserve">
<value>1</value>
<comment>AccessKey for the Standard mode navbar item. {StringCategory="Accelerator"}</comment>
</data>
<data name="CategoryName_AngleAccessKey" xml:space="preserve">
<value>AN</value>
<comment>AccessKey for the angle converter navbar item. {StringCategory="Accelerator"}</comment>
@@ -4218,4 +4202,4 @@
<value>Current mode is graph mode</value>
<comment>Announcement used in Graphing Calculator when switching to the graph mode</comment>
</data>
</root>
</root>

37
src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml
View File

@@ -38,28 +38,29 @@
</Grid.RowDefinitions>
<Button x:Name="KGFEquationButton"
x:Uid="equationAnalysisBack"
MinWidth="44"
MinHeight="44"
VerticalAlignment="Stretch"
Background="{TemplateBinding EquationColor}"
Foreground="{StaticResource SystemChromeWhiteColor}"
BorderThickness="0">
x:Uid="equationAnalysisBack"
MinWidth="44"
MinHeight="44"
VerticalAlignment="Stretch"
Background="{TemplateBinding EquationColor}"
Foreground="{StaticResource SystemChromeWhiteColor}"
BorderThickness="0">
<Button.Content>
<StackPanel x:Name="FunctionNumberLabel"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="Transparent"
Orientation="Horizontal"
Margin="5,0">
<FontIcon VerticalAlignment="Center"
Margin="5,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="Transparent"
Orientation="Horizontal">
<FontIcon Margin="0,0,6,0"
VerticalAlignment="Center"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="16"
Glyph="&#xE72B;" Margin="0,0,6,0"/>
Glyph="&#xE72B;"/>
<FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xF893;"/>
<TextBlock Margin="-5,19,0,0"
FontSize="11"
Text="{TemplateBinding EquationButtonContentIndex}"/>
FontSize="11"
Text="{TemplateBinding EquationButtonContentIndex}"/>
</StackPanel>
</Button.Content>
@@ -201,9 +202,9 @@
<ContentPresenter x:Name="DescriptionPresenter"
Grid.Row="2"
Foreground="{ThemeResource SystemControlDescriptionTextForegroundBrush}"
x:Load="False"
AutomationProperties.AccessibilityView="Raw"
Content="{TemplateBinding Description}"/>
Content="{TemplateBinding Description}"
x:Load="False"/>
</Grid>

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

@@ -499,6 +499,7 @@ MUXC::NavigationViewItem ^ MainPage::CreateNavViewItemFromCategory(NavCategory ^
item->Content = category->Name;
item->AccessKey = category->AccessKey;
item->IsEnabled = category->IsEnabled;
item->Style = static_cast<Windows::UI::Xaml::Style ^>(Resources->Lookup(L"NavViewItemStyle"));
AutomationProperties::SetName(item, category->AutomationName);