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

Addressed PR comments

Browse source
This commit is contained in:
greedyAI 2021-02-01 11:43:46 -08:00
commit da52680743
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/CalcViewModel/Common/NavCategory.cpp
View file

@ -60,7 +60,7 @@ bool IsGraphingModeAvailable()
} }
Box<bool> ^ _isGraphingModeEnabledCached = nullptr; Box<bool> ^ _isGraphingModeEnabledCached = nullptr;
bool IsGraphingModeEnabled(User ^ firstUser = nullptr) bool IsGraphingModeEnabled(User ^ currentUser = nullptr)
{ {
if (!IsGraphingModeAvailable()) if (!IsGraphingModeAvailable())
{ {
@ -72,12 +72,12 @@ bool IsGraphingModeEnabled(User ^ firstUser = nullptr)
return _isGraphingModeEnabledCached->Value; return _isGraphingModeEnabledCached->Value;
} }
if (!firstUser) if (!currentUser)
{ {
return false; return true;
} }
auto namedPolicyData = NamedPolicy::GetPolicyFromPathForUser(firstUser, L"Education", L"AllowGraphingCalculator"); auto namedPolicyData = NamedPolicy::GetPolicyFromPathForUser(currentUser, L"Education", L"AllowGraphingCalculator");
_isGraphingModeEnabledCached = namedPolicyData->GetBoolean() == true; _isGraphingModeEnabledCached = namedPolicyData->GetBoolean() == true;
return _isGraphingModeEnabledCached->Value; return _isGraphingModeEnabledCached->Value;
@ -280,9 +280,21 @@ static list<NavCategoryInitializer> s_categoryManifest = [] {
void NavCategory::InitializeCategoryManifest(User ^ user) void NavCategory::InitializeCategoryManifest(User ^ user)
{ {
auto navCatInit = s_categoryManifest.begin(); int i = 0;
std::advance(navCatInit, 2); for (NavCategoryInitializer category : s_categoryManifest)
(*navCatInit).isEnabled = IsGraphingModeEnabled(user); {
if (category.viewMode == ViewMode::Graphing)
{
auto navCatInit = s_categoryManifest.begin();
std::advance(navCatInit, i);
(*navCatInit).isEnabled = IsGraphingModeEnabled(user);
break;
}
else
{
i++;
}
}
} }
// This function should only be used when storing the mode to app data. // This function should only be used when storing the mode to app data.