From 9d0010bf48213daed75a5817f661b460224e6817 Mon Sep 17 00:00:00 2001 From: Maharramoff Date: Mon, 11 Mar 2019 02:24:17 +0400 Subject: [PATCH] Revert "refactor: simplified if statements" This reverts commit 6e4d0a8b2c76d13e376a9a09b9e26095c8026259. --- src/CalcManager/UnitConverter.cpp | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/CalcManager/UnitConverter.cpp b/src/CalcManager/UnitConverter.cpp index e6448206..e30934f4 100644 --- a/src/CalcManager/UnitConverter.cpp +++ b/src/CalcManager/UnitConverter.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #include "pch.h" @@ -109,8 +109,22 @@ CategorySelectionInitializer UnitConverter::SetCurrentCategory(const Category& i vector& unitVector = m_categoryToUnits[m_currentCategory]; for (unsigned int i = 0; i < unitVector.size(); i++) { - unitVector[i].isConversionSource = unitVector[i].id == m_fromType.id; - unitVector[i].isConversionTarget = unitVector[i].id == m_toType.id; + if (unitVector[i].id == m_fromType.id) + { + unitVector[i].isConversionSource = true; + } + else + { + unitVector[i].isConversionSource = false; + } + if (unitVector[i].id == m_toType.id) + { + unitVector[i].isConversionTarget = true; + } + else + { + unitVector[i].isConversionTarget = false; + } } m_currentCategory = input; if (!m_currentCategory.supportsNegative && m_currentDisplay.front() == L'-')