Commit Graph

215 Commits

Author SHA1 Message Date
hanzhang54
e06355c9aa
Update to WinUI 2.6 (#1618)
* Update to WinUI 2.6

Co-authored-by: Han Zhang <zhangh@microsoft.com>
Co-authored-by: Kenny Guo <kennyguo@microsoft.com>

**Description of the changes:**
1. Update to WinUI 2.6 styles and controls #1606.
2. Add Mica Material #1611.
3. Add Settings page #596.
4. Fix Ctrl+E shortcuts in AoT mode #1590.

**How changes were validated:**
Passed build, UT/UI test and manually tested.

* Fixed the display issue in AOT mode (#1615)

* Fixed the display issue in AOT mode

* Get the OpenPaneLength from the resource

* Fix CalendarView style in DateCalculation of dark mode (#1616)

* Fix a style problem of Date Calculator, and clean some unused codes

* Remove some unused codes

* Disable Mica before close the window to resolve a crash (#1619)

* Bump internal package build number (#1621)
2021-07-27 17:35:16 +08:00
Huy Duong
830115633c
fixed titlebar (#1613)
Fixes titlebar text high contrast issue.
2021-07-20 18:04:34 -07:00
Tian L
fdae1000fc
Hello C# - Migrating the codebase from C++/CX to C# (Phase 1) (#1598)
* Hello C# - Going to an official feature branch (#1544)

* change CalcViewModel into a WindowsRuntimeComponent project (#5)

* change CalcViewModel into a WindowsRuntimeComponent project

* remove the old UI codebase (#6)

* initially migrated C# codebase by tian (#7)

* initial migrated C# codebase by tian

* format the codebase

* resolve comments

* undo: modifications on UI test project

* Remove the blocks that have more than 1 empty line.

* Register DP using keyword 'nameof'

* C# Migration: Initially migrated C# codebase by Han (#8)

* C# Migration: Initially migrated C# codebase by Han

* Resolved comments and misssing asset

* Added three files to Calculator project

* Added TODO comment and updated Object

* NavCategory: temporary resolution of the hang issue (#9)

* Updated CalcViewModel and missing files (#10)

* Updated CalcViewModel and WinMeta

* Added Calculator.rc

* Resolved comment for InitializeLocalizationSettings

* add: views/unitconverter.xaml (#11)

* add: views/unitconverter.xaml

* format the code

* remove the extra empty line

* add an empty line

* check null before invoking event handlers (#12)

* fix problems of the migration of OBSERVABLE_PROPERTY_RW (#13)

* fixes crash in MathRichEditBox.ctor() (#14)

* fixes crash in MathRichEditBox.ctor()

* typo

* Update azure-pipelines.ci.yaml for Azure Pipelines

* Added a link copy of CalcViewModel to temporarily pass Unit Tests (#16)

* Updated CalcViewModelCopyForUT configuration (#17)

* changes output path of the UI project to align with other projects (#15)

* fixes EETypeLoadException issue: export class DelegateCommand (#18)

* fixes EETypeLoadException issue: export class DelegateCommand

* weak-reference in C++/CX

* WeakRef in C# codebase

* UTF-8-BOM

* spaces in macro

* resolve some comments from the offline review

* format

* rename file

* fixes the memory list issue (#20)

* fixes a wrongly migrated property

* UTF-8-BOM

* fixes up the crash of type casting (#21)

* Update localized strings 2021-01-04 (#1458) (#23)

(cherry picked from commit cdcb95656d)

Co-authored-by: Matt Cooley <macool@microsoft.com>

* Fixup tests (#1429) (#24)

- Removed unneeded "ToString" calls
- Fixed typos
- Renamed "fEButtonState" to "FEButtonState"

(cherry picked from commit 66ad328d00)

Co-authored-by: N <71219152+PokeCodec@users.noreply.github.com>

* Update graph internal engine verseion (#1466) (#25)

(cherry picked from commit 0048dcb500)

Co-authored-by: Quentin Al-Timimi <27322516+quentin987@users.noreply.github.com>

* Turn off DFS file shares in internal build system (#1470) (#26)

(cherry picked from commit 885fa23a89)

Co-authored-by: Matt Cooley <macool@microsoft.com>

* Improve clarity of math expressions in history for Standard Calculator (feature #138) (#1453) (#27)

* Implemented feature & added unit tests

* Fixed more unit/ui tests

* Refactored tests

* Update HistoryTests.cpp

* Update HistoryTests.cpp

* Update HistoryTests.cpp

* Update HistoryTests.cpp

* Update HistoryTests.cpp

* Update HistoryTests.cpp

* Update HistoryTests.cpp

* Update HistoryTests.cpp

(cherry picked from commit 565e3e2714)

Co-authored-by: Wei (Waley) Zhang <waley.zhang@microsoft.com>

* Adds unit-test cases for NarratorAnnouncement after fixing issue #1386 (#1469) (#28)

* fix bug: No confirmation is announced by the narrator after activating 'Remove equation' button #1386

* Unit Test: Add NarratorAnnouncementUnitTests

Co-authored-by: tain <tankle_@hotmail.com>
(cherry picked from commit 9d8e2ad18c)

Co-authored-by: Tian L <60599517+MSFT-Tilia@users.noreply.github.com>

* Move localization pipeline sync schedule to the YAML file (#1478) (#30)

(cherry picked from commit 007eccd940)

Co-authored-by: Matt Cooley <macool@microsoft.com>

* remove the strong reference carried from delegate (#32)

* Remove the finalizer of ControlSizeTrigger (#31)

* Normalize the namespace of CalcViewModel (#33)

* ViewMode: arrange namespaces

* UI build pass

* run release

* UT build pass

* pass build

* resolve comment: make the diff results cleaner

* resolve comment: make the diff results cleaner (2)

* resolve comment: make the diff results cleaner (3)

* resolve comment: move impl into a namespace

* update: spaces

* update: CalculatorButtonUser.h

* UTF-8 to UTF-8-BOM

* remove ViewState.h/.cpp from CalcViewModel path

* revert changes for NavCategory.cpp

* remove extra space

* remove UCM

* remove BOM

* Fixed a graphing calculator "permissions" bug caused by PR #1426 (#1471) (#34)

- The PR #1426 can cause a crash when no users are returned via `User::FindAllAsync(UserType::LocalUser)` when subsequently trying to access the first user. The existing code also does not guarantee that the returned user is the currently active user.
- This fix retrieves the user that opened the app and passes this user into a function to check if this user has the proper permissions to access the graphing mode. This makes sense since the active user is indistinguishable (at least from the app's perspective) to the user who opened the app. This user's permissions are then propagated downwards to properly set up the navigation menu of the app.
- Implementation detail worth pointing out: `s_categoryManifest` is what is used to populate the navigation menu of the app, but this variable is static by design, so a separate function was written to override the appropriate `isEnabled` value in `s_categoryManifest`. This function is called by `onLaunched`.

- Manual testing

Co-authored-by: Wei (Waley) Zhang <waley.zhang@microsoft.com>

* fixes up a bug (#35)

* fix csproj (#37)

Co-authored-by: hanzhang54 <zhangh@microsoft.com>
Co-authored-by: Matt Cooley <macool@microsoft.com>
Co-authored-by: N <71219152+PokeCodec@users.noreply.github.com>
Co-authored-by: Quentin Al-Timimi <27322516+quentin987@users.noreply.github.com>
Co-authored-by: Wei (Waley) Zhang <waley.zhang@microsoft.com>
Co-authored-by: Tian L <60599517+MSFT-Tilia@users.noreply.github.com>

* **BYPASS_SECRET_SCANNING** (#1546)

* Fixes a bug about the UI of expression tokens (#1547)

* fix

* [FeatureBranch] Fixes x86/ARM/ARM64 builds for the CI-Pipeline (#1550)

* **BYPASS_SECRET_SCANNING**

* fix

* fixes x86/ARM/ARM64 builds for CI-Pipeline

* Add headers missing for compilation with GCC (#1468) (#1551)

Things that required such update included:
* `wstringstream`
* `setprecision`
* `SCODE_CODE`, `E_BOUNDS`
* Various SAL macros

Co-authored-by: Michał Janiszewski <janisozaur@users.noreply.github.com>

* Update nuget.config file (#1486) (#1552)

Co-authored-by: Matt Cooley <macool@microsoft.com>

* Fixes up some simple miscellaneous TODO items (#1556)

* #DEBUG is a known C# preprocessor directive

* So far, we haven't observed the problem described in the comment from C# async

* fixes misc TODO items

* resolve some warnings (#1564)

* Add internal CI pipeline (#1553) (#1565)

* Add CI-internal pipeline

* No ARM64, to match release

Co-authored-by: Matt Cooley <macool@microsoft.com>

* Temporarily disable PGO NuGet package (#1510) (#1566)

Co-authored-by: Matt Cooley <macool@microsoft.com>

* [C# Calc]Removes WinMeta.cs (#1567)

* remove WinMeta.cs

* undo a trivial change

* UTF-8 BOM

* [C# Calc] Reverts some changes for Currency constants (#1570)

* Update2108release - experimental (#1572)

* adjusts Calculator.csproj (#1571)

* fixes BinSkim problems (#1573)

* fixes an issue around line style (#1575)

* fixes the missed NULLs (#1576) (#1578)

* Fix the Missing Part in Unit Converter Constructor (#1579)

* fixes: calculator doesn't remember its previous mode (#1580)

* Fixes: GraphingNumber doesn't work correctly (#1585)

* fixes: GraphingNumber doesn't work correctly

* Avoid crashing

* fixes binding (#1586)

* resolve TODO items (#1589)

* Improving keyboard support in VariableValueSlider (#1559) (#1595)

Co-authored-by: Dave Grochocki <grochocki@users.noreply.github.com>

* [C# Calc] Fixes: Keep the value away from getting rounded in Graphing Mode (#1596)

* keep the value away from getting rounded

* set the display precision to 6 to align with C++ impl

* fixes the button-light-up time (#1597)

* fixes up merging flaws

* Update2108release

* fixes (#1599)

* keep master for ci pipeline

* remove the Resources filter from CalcViewModel project

* removes `that` since `this` can be captured automatically

* AppxBundlePlatforms

* StampAssemblyInfo

* removes PreferredToolArchitecture

* Change the arg AppVersion into Version

* Change the arg AppVersion into Version

* from Calculator.rc to AssemblyInfo.cs

* Adds assembly-info

Co-authored-by: hanzhang54 <zhangh@microsoft.com>
Co-authored-by: Matt Cooley <macool@microsoft.com>
Co-authored-by: N <71219152+PokeCodec@users.noreply.github.com>
Co-authored-by: Quentin Al-Timimi <27322516+quentin987@users.noreply.github.com>
Co-authored-by: Wei (Waley) Zhang <waley.zhang@microsoft.com>
Co-authored-by: Tian L <60599517+MSFT-Tilia@users.noreply.github.com>
Co-authored-by: Michał Janiszewski <janisozaur@users.noreply.github.com>
Co-authored-by: Dave Grochocki <grochocki@users.noreply.github.com>
2021-07-15 17:12:38 +08:00
Dave Grochocki
3cc3eaf4e0
Improving keyboard support in VariableValueSlider (#1559) 2021-06-03 03:23:45 -07:00
Michał Janiszewski
f30e9494ce
Clang-format most of the sources (#1467) 2021-05-10 10:18:39 -07:00
achmurali
ea61391a62
Disabled focus for 2nd button (#1523)
Co-authored-by: achmurali <achmurali@github.com>
2021-04-20 12:08:35 -07:00
Hongxu Xu
f910d64d88
Handle Space and Enter KeyDown event for About button (#1459) 2021-01-11 11:46:08 -08:00
Rudy Huyn
3172f7fea2
Prevents the user interface from shifting upwards at launch (#633)
Co-authored-by: Matt Cooley <macool@microsoft.com>
Co-authored-by: Pepe Rivera <joseartrivera@gmail.com>
2020-12-16 14:46:37 -08:00
Chaitanya Mehta
c4793785c3
Add link to GitHub repo on about flyout (#1449)
* Add link to GitHub repo on about flyout

* Update AboutFlyout page GitHub link margin.

* Update AboutPage GitHub link string.
2020-12-10 21:04:18 -08:00
Jack Rainy
903b231b1f
Edit fields are scalable for large fonts (#1401)
* Edit fields are scalable for large fonts

* Retain the initial width of edit fields, but scale if needed
2020-10-22 09:28:26 -07:00
Rudy Huyn
bc473617ae
Simplify KeyboardShortcutManager and correctly support Alt-Gr key (#1223)
* Simplify KeyboardShortcutManager and correctly support Alt-Gr key

* replace multimap with map
move all global fields-functions to the class

* feedback

Co-authored-by: Eric Wong <eriwong@microsoft.com>
2020-09-15 12:43:50 -07:00
Stephanie Anderl
503c27ae7b
Update WinUI Version to 2.4 (#1354)
* Updated to WinUI2.4 and fixed NavMenu about flyout and Dark Mode EquationEditBox

* Added updated equationbox background to the focusederror state
2020-09-01 16:48:22 -07:00
Lee Won Jun
9206520121
Change the initialization time of Radio button's isChecked (#1312)
* Change the initialization time of Radio button's isChecked

* Rollback checkDefaultBitShift and Use Enum instead of String

* Fix Check Default
- In previous versions, there was an issue where button availability was reset when opening BitShift Flyout not when the mode is changed

* Reset Calculator Type in Calculator ViewModel when mode change to not Calculator mode

* Revert "Reset Calculator Type in Calculator ViewModel when mode change to not Calculator mode"

This reverts commit a0d2f84513bc2d36fea3d75445782e1c67bc2e8d.

* Check deferred load button
2020-08-20 15:30:48 -07:00
Callum Shipton
95a1ba4c8c
'Keep on top' button appears last in the tab order (#1339) (#1347)
- Added TabIndex to AlwaysOnTop button
2020-08-12 09:14:45 -07:00
Callum Shipton
331388c000
Enable keyboard entry in bit-toggling mode #478 (#1346)
The programmer radix buttons were being disabled when the bit flip panel was selected, causing keyboard events to be ignored.
They should actually only be hidden in bit flip mode.

- Corrected programmer radix buttons to continue being enabled just hidden when the programmer calculator is in bit flip mode.
- Renamed AreProgrammerRadixOperatorsEnabled property to the more appropriate AreProgrammerRadixOperatorsVisible.
2020-08-12 08:53:31 -07:00
Rudy Huyn
1c8b642376
Remove ICustomPropertyProviders (#1229)
* Remove unused ICustomPropertyProviders
* Modify UI tests to not use Customproperties
2020-08-12 08:22:49 -07:00
Eric Tian
0e1c4f8cb4
CornerRadius! (#1321) 2020-07-21 14:28:47 -07:00
Eric Tian
7379876432
Fix accent colour mouse-over (#1315) 2020-07-21 09:23:49 -07:00
Vignesh M
264babc608
Resolution for Bit Shift radio button announcements (#1317) 2020-07-20 15:05:22 -07:00
Quentin Al-Timimi
0175b51655
Updated APIs to use new GetClosePointData() from Graphing Engine. (#1250)
* Updated APIs to use new GetClosePointData() from Graphing Engine. Now specifiying precision on API consumption to aid with correct display and rounding.

* Updated function to be const-corect

* Updated to use correct APIs

* Converted TraceValue from Point to two doubles, point's X and Y was using float and conversion between float and doubles was causing unwanted rounding.

* Update to pch file and fixing typo

* Point to updated graphing version
2020-06-30 15:08:54 -07:00
Vignesh M
a3163f64e3
Narrator reads incorrect information as “History and Memory list” in Programmer Calculator #1174 (#1286) 2020-06-26 14:38:42 -07:00
Pepe Rivera
876a7fe13c
Remove preview tag from graphing mode (#1285)
* Remove preview tag

* Remove preview tag

* fix bug
2020-06-23 13:06:23 -07:00
Pepe Rivera
81ea002cf9
Fix equations not getting focus after being removed (#1271) 2020-06-16 09:58:20 -07:00
Pepe Rivera
8f56ad0dc6
Fix tracing button not receiving focus after the 'esc' key is used to exit tracing mode (#1272) 2020-06-16 09:58:02 -07:00
Pepe Rivera
db15b602f9
Fix bitwise popup focus order (#1273) 2020-06-16 09:57:43 -07:00
Pepe Rivera
4c8e1cb5f0
Check for valid input in min/max/step fields (#1270) 2020-06-15 14:13:56 -07:00
Rudy Huyn
0a4296f06a
Modify how we manage round corners (#1261) 2020-06-02 12:58:47 -07:00
Quentin
178075d7d7
Setting IsEnabled to be conditional based on the AlwaysOnTop flag, (#1243) 2020-05-26 12:59:06 -05:00
Stephanie Anderl
9a07755620
Fixed narrator issues in KGF and GraphView button, updated Trig radio button corner radius (#1227)
* 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>
2020-05-26 09:34:45 -07:00
Rudy Huyn
143907f21f
Remove dead code from History (#1228)
* Clean history

* clean unit tests

* cleaning

* Remove friend class in HistoryViewModel
2020-05-25 15:02:27 -07:00
Pepe Rivera
f2e423329d
Improve launch performance by delay loading NavigationView (#1213)
* Delay load graph engine

* Remove default behavior

* Delay load nav view

* Add automation properties

* clean up

* handle shortcut keys

* Include only navview changes

* Address PR comments

* manual merge fix

* PR Changes

* Undo other changes

* reset resw file

* fix margin
2020-05-19 09:58:11 -07:00
Rudy Huyn
80fbe891d6
Fix graph dark colors at launch (#1217) 2020-05-15 10:44:50 -07:00
Pepe Rivera
0f14e4f46e
Use ToggleButton for variable options chevron button (#1219)
* Use togglebutton instead

* Update src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml

Co-authored-by: Rudy Huyn <rudyhuyn@gmail.com>

* Update src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml

Co-authored-by: Rudy Huyn <rudyhuyn@gmail.com>

* undo pr suggestion

Co-authored-by: Rudy Huyn <rudyhuyn@gmail.com>
2020-05-13 18:42:35 -07:00
Rudy Huyn
7a6b0a72c3
Tweak UI: Title and History/Memory panels (#1215) 2020-05-11 16:38:45 -07:00
Pepe Rivera
1eda521992
fix style bugs in graph options (#1225) 2020-05-11 14:59:27 -07:00
Pepe Rivera
47760b4514
Don't submit equation when opening context menu (#1220)
* Don't submit equation when opening context menu

* Clean up
2020-05-08 18:50:22 -07:00
Pepe Rivera
66b64afd75
Fix styling bugs in graph settings and style panel (#1202) 2020-05-08 12:14:01 -07:00
Quentin
7b4ff49df8
Issue 935 - Updates to Scientific/Graphing Keypad (#1214)
* Switching from Difference between dates to Add or subtract dates ignores the first date field

https://github.com/microsoft/calculator/issues/254

Date field needs to persist across Date Difference and Add/Subtract From Date Mode.

* Update DateCalculator.xaml.cpp

Addressing review comments (white space, small code refactor), also found a null pointer exception during testing, this fix addresses that as well.

* Issue 935 - Updates to Scientific/Graphing Keypad

Update Scientific and Graphing keyboard layouts to expose square root button at the top level

* Updated ScientificModeFunctionalTests/SmokeTest_Cube()

Updated broken test to work with changes.
2020-05-08 12:32:17 -05:00
Stephanie Anderl
1e302cac58
Associate Units and Theme labels with the radio button groups (#1211)
* Wrap theme radio buttons in MUXC RadioButtons control to fix accessibility issue where the buttons are grouped with the theme title

* Associated theme labels with radio button groups
2020-05-07 16:41:08 -07:00
Quentin
fd48f6ec1d
Switching from Difference between dates to Add or subtract dates ignores the first date field (#1210) 2020-05-06 15:14:54 -07:00
Stephanie Anderl
3055a12178
Updated EquationButton contrast fixed dark mode foreground color bugs (#1155)
* Fixed contrast between background and foreground colors in the equation button. Fixed the issue where the text in the equation text box is white when the background is white

* Adjust the foreground color algorithm

* moved the contrast method to utils so that it is resuable

* Moved brushes for the GetContrastColor method to the app.xaml resource dictionary

* Removed the change for the edit box colors, so it can be in a different PR
2020-05-05 10:20:05 -07:00
Pepe Rivera
9817738307
Catch exception when trying to share (#1203)
* Fix crash

* Fix errors
2020-05-05 09:36:09 -07:00
Rudy Huyn
6e521d8f29
Remove LRE/LRO characters from results and error messages (#1161)
* Remove LRE/LRO characters and rely on Xaml to correctly displayed the numbers and error messages RtL

* unit tests
2020-04-30 12:04:33 -07:00
Pepe Rivera
c2c92f4006
Set IsTextScaleFactorEnabled to true for HEX, DEC, OCT, BIN buttons (#1157)
* fix scale factor

* Allow expression to scale
2020-04-24 10:03:04 -07:00
Pepe Rivera
db86e949f9
Don't create a new flyout every time the graph settings button is clicked (#1197)
* attempt a fix

* fix ranges
2020-04-24 10:02:44 -07:00
Pepe Rivera
0465dc8538
Change trace point value precision to be dynamic based on graph scale (#1148)
* Dynamic precision

* add comments

* feedback

* Update src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp

Co-Authored-By: Rudy Huyn <rudyhuyn@gmail.com>

* PR feedback

* Pr comment

Co-authored-by: Rudy Huyn <rudyhuyn@gmail.com>
2020-04-21 17:44:08 -07:00
Stephanie Anderl
1ded2c57db
Fixed crash when in high contrast (#1159)
* Fixed line colors out of bounds issue when switching to high contrast

* Update the fix to not reload the colors OnColorChanged when in HighContrast
2020-04-15 12:42:31 -07:00
Pepe Rivera
15b957c98b
Fix line becoming enabled on focus lost (#1167) 2020-04-14 15:51:17 -07:00
Stephanie Anderl
3a8fcaa18a
Update Icons Implement the Graph View Button (#1149)
* Update icon file

* function analysis and negate button icons updated

* Replace zoom reset button with graph view button

* Fixed issue where the window settings did not update after panning/zooming

* Updated icon styling and added logic for updating the graph view button state when user manipulates the graph and when all equations are removed

* updated LogGraphButton clicked to have an enum for the button value instead of a string

* Updated the logic for how to set the IsManualAdjustment, ensured graphsettings now update IsManualAdjustment when changed
2020-04-14 12:37:23 -07:00
Stephanie Anderl
7612b69949
Add Automation Names to the GraphNumPad (#1145)
* Turn off keyboard shortcuts when in graphing mode

* Added automation names to the graphnumpad, added any missing ones to the resources.resw file

* Remove HonorShortcuts call in the EquationInputArea, update Equal button automation name to use the existing one

* conditionally set the HonorShortcuts when the nav menu is closed

* added disable shortcuts to override HonorShortcuts when it is set
2020-04-14 12:37:00 -07:00