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

Fixed narrator issues in KGF and GraphView button, updated Trig radio button corner radius (#1227)

Browse Source 
* fixed the trig units radio buttons rounded corners and narrator issues in kgf and graph reset

* removed extra whitespace

* Update src/Calculator/Resources/en-US/Resources.resw

Co-authored-by: Eric Wong <eriwong@microsoft.com>

* Update src/Calculator/Resources/en-US/Resources.resw

Co-authored-by: Eric Wong <eriwong@microsoft.com>

Co-authored-by: Eric Wong <eriwong@microsoft.com>
This commit is contained in:
Stephanie Anderl 2020-05-26 09:34:45 -07:00 committed by GitHub
parent 143907f21f
commit 9a07755620
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CalcViewModel/Common/Automation/NarratorAnnouncement.cpp
View File

@ -160,7 +160,7 @@ NarratorAnnouncement ^ CalculatorAnnouncement::GetGraphViewChangedAnnouncement(S
announcement,
CalculatorActivityIds::GraphViewChanged,
AutomationNotificationKind::ActionCompleted,
AutomationNotificationProcessing::MostRecent);
AutomationNotificationProcessing::CurrentThenMostRecent);
}
NarratorAnnouncement ^ CalculatorAnnouncement::GetFunctionRemovedAnnouncement(String ^ announcement)

8
src/Calculator/Calculator.vcxproj.filters
View File

@ -486,9 +486,6 @@
<Filter>Views</Filter>
</Page>
<Page Include="AboutFlyout.xaml" />
<Page Include="Views\CalculatorProgrammerDisplayPanel.xaml">
<Filter>Views</Filter>
</Page>
<Page Include="Views\CalculatorProgrammerBitFlipPanel.xaml">
<Filter>Views</Filter>
</Page>
@ -524,6 +521,9 @@
</Page>
<Page Include="Controls\PreviewTagControl.xaml" />
<Page Include="EquationStylePanelControl.xaml" />
<Page Include="Views\CalculatorProgrammerDisplayPanel.xaml">
<Filter>Views\StateTriggers</Filter>
</Page>
</ItemGroup>
<ItemGroup>
<PRIResource Include="Resources\en-US\CEngineStrings.resw">
@ -1581,5 +1581,7 @@
<ItemGroup>
<CopyFileToFolders Include="$(GraphingImplDll)" />
<CopyFileToFolders Include="$(GraphingEngineDll)" />
<CopyFileToFolders Include="$(GraphingImplDll)" />
<CopyFileToFolders Include="$(GraphingEngineDll)" />
</ItemGroup>
</Project>

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

@ -3885,11 +3885,15 @@
</data>
<data name="GraphViewAutomaticBestFitAnnouncement" xml:space="preserve">
<value>Automatic Best Fit</value>
<comment>Announcement used in Graphing Calculator when button is clicked and automatic best fit is set</comment>
<comment>Announcement used in Graphing Calculator when graph view button is clicked and automatic best fit is set</comment>
</data>
<data name="GraphViewManualAdjustmentAnnouncement" xml:space="preserve">
<value>Manual Adjustment</value>
<comment>Announcement used in Graphing Calculator when button is clicked and manual adjustment is set</comment>
<comment>Announcement used in Graphing Calculator when graph view button is clicked and manual adjustment is set</comment>
</data>
<data name="GridResetAnnouncement" xml:space="preserve">
<value>Graph view has been reset</value>
<comment>Announcement used in Graphing Calculator when graph view button is clicked and automatic best fit is set, resetting the graph</comment>
</data>
<data name="zoomInButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Zoom In (Ctrl + plus)</value>
@ -4424,12 +4428,12 @@
<comment>Y minimum value header</comment>
</data>
<data name="graphSettingsButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Grid options</value>
<comment>This is the tooltip text for the grid options button in Graphing Calculator</comment>
<value>Graph options</value>
<comment>This is the tooltip text for the graph options button in Graphing Calculator</comment>
</data>
<data name="graphSettingsButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Grid options</value>
<comment>This is the automation name text for the grid options button in Graphing Calculator</comment>
<value>Graph options</value>
<comment>This is the automation name text for the graph options button in Graphing Calculator</comment>
</data>
<data name="GraphOptionsHeading.Text" xml:space="preserve">
<value>Graph Options</value>
@ -4695,4 +4699,12 @@
<value>Submit</value>
<comment>Screen reader prompt for the submit button on the graphing calculator operator keypad</comment>
</data>
<data name="FunctionAnalysisGrid.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Function Anaylsis</value>
<comment>Screen reader prompt for the function analysis grid</comment>
</data>
<data name="GraphSettingsGrid.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Graph Options</value>
<comment>Screen reader prompt for the graph options panel</comment>
</data>
</root>

3
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp
View File

@ -846,8 +846,9 @@ void GraphingCalculator::GraphViewButton_Click(Object ^ sender, RoutedEventArgs
}
else
{
GraphingControl->ResetGrid();
announcementText = AppResourceProvider::GetInstance()->GetResourceString(L"GraphViewAutomaticBestFitAnnouncement");
announcementText += AppResourceProvider::GetInstance()->GetResourceString(L"GridResetAnnouncement");
GraphingControl->ResetGrid();
}
auto announcement = CalculatorAnnouncement::GetGraphViewBestFitChangedAnnouncement(announcementText);

4
src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml
View File

@ -172,7 +172,9 @@
Style="{StaticResource SubTitleTextBoxStyle}"
AutomationProperties.HeadingLevel="Level2"/>
<StackPanel AutomationProperties.LabeledBy="{Binding ElementName=UnitsHeading}" Orientation="Horizontal">
<StackPanel AutomationProperties.LabeledBy="{Binding ElementName=UnitsHeading}"
CornerRadius="4"
Orientation="Horizontal">
<RadioButton x:Name="Radians"
x:Uid="TrigModeRadians"
Style="{StaticResource TrigUnitsRadioButtonStyle}"

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

@ -218,7 +218,7 @@
</ResourceDictionary>
</UserControl.Resources>
<Grid>
<Grid x:Uid="FunctionAnalysisGrid">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>