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

Add projects to migrate ViewModel code to C# (#1895)

Browse source 
* Rename the existing CalculatorApp.ViewModel.* namespaces to CalculatorApp.ViewModelNative.*
* Add a new C# class library project for CalculatorApp.ViewModel
* Add a new C# test project, CalculatorApp.ViewModel.Tests and run the tests in the pipeline
* To prove it all works: port the Utilities.GetWindowId function from C++ to C# and call the new version from the Calculator project and from a unit test
This commit is contained in:
Matt Cooley 2022-09-29 21:29:21 -07:00 • committed by GitHub
commit 62ca1ddf1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
157 changed files with 1118 additions and 473 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/CalcViewModel/Common/Utils.h
View file

@ -174,8 +174,8 @@ public:
{ \
if (!donotuse_##p) \
{ \
donotuse_##p = ref new CalculatorApp::ViewModel::Common::DelegateCommand( \
CalculatorApp::ViewModel::Common::MakeDelegateCommandHandler(this, &m) \
donotuse_##p = ref new CalculatorApp::ViewModelNative::Common::DelegateCommand( \
CalculatorApp::ViewModelNative::Common::MakeDelegateCommandHandler(this, &m) \
); \
} \
return donotuse_##p; \
@ -394,7 +394,6 @@ namespace Utils
}
double GetDoubleFromWstring(std::wstring input);
int GetWindowId();
void RunOnUIThreadNonblocking(std::function<void()>&& function, _In_ Windows::UI::Core::CoreDispatcher ^ currentDispatcher);
Windows::Foundation::DateTime GetUniversalSystemTime();
@ -705,7 +704,7 @@ namespace CalculatorApp
return to;
}
namespace ViewModel::Common
namespace ViewModelNative::Common
{
// below utilities are intended to support interops between C# and C++/CX
// they can be removed if the entire codebase has been migrated to C#
@ -715,7 +714,6 @@ namespace CalculatorApp
static Platform::String ^ EscapeHtmlSpecialCharacters(Platform::String ^ originalString);
static bool AreColorsEqual(Windows::UI::Color color1, Windows::UI::Color color2);
static Windows::UI::Xaml::Media::SolidColorBrush ^ GetContrastColor(Windows::UI::Color backgroundColor);
static int GetWindowId();
static long long GetConst_WINEVENT_KEYWORD_RESPONSE_TIME();
static bool GetIntegratedDisplaySize(double* size);
};