Merge pull request #6226 from unoplatform/mergify/bp/release/stable/3…

….8/pr-6220 fix(calendar): Fix few C++ translation issues (backport #6220)
unoplatform · Jun 10, 2021 · 1c03259 · 1c03259
2 parents 5993df8 + 03c3952
commit 1c03259
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarLayoutStrategy_Partial.cs b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarLayoutStrategy_Partial.cs
@@ -239,7 +239,7 @@ private void HasIrregularSnapPointsImpl(
 			out bool returnValue) /*override*/
 		{
 			returnValue = false;
-			returnValue = !!_layoutStrategyImpl.HasIrregularSnapPoints(elementType);
+			returnValue = _layoutStrategyImpl.HasIrregularSnapPoints(elementType);
 		}
 
 		private void HasSnapPointOnElementImpl(

diff --git a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewGeneratorHost.cs b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewGeneratorHost.cs
@@ -151,7 +151,7 @@ internal virtual void PrepareItemContainer(
 
 					isTodayHighlighted = Owner.IsTodayHighlighted;
 
-					isToday = !!isTodayHighlighted;
+					isToday = isTodayHighlighted;
 				}
 
 				spContainer.SetIsToday(isToday);

diff --git a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewGeneratorMonthViewHost.cs b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewGeneratorMonthViewHost.cs
@@ -68,7 +68,7 @@ internal override void PrepareItemContainer(
 
 				isLabelVisible = Owner.IsGroupLabelVisible;
 
-				UpdateLabel(spContainer, !isLabelVisible);
+				UpdateLabel(spContainer, isLabelVisible);
 			}
 
 			// today state will be updated in CalendarViewGeneratorHost.PrepareItemContainer

diff --git a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewGeneratorYearViewHost.cs b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewGeneratorYearViewHost.cs
@@ -58,7 +58,7 @@ internal override void PrepareItemContainer(
 
 				isLabelVisible = Owner.IsGroupLabelVisible;
 
-				UpdateLabel(spContainer, !isLabelVisible);
+				UpdateLabel(spContainer, isLabelVisible);
 			}
 
 			// today state will be updated in CalendarViewGeneratorHost.PrepareItemContainer

diff --git a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarView_Partial.cs b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarView_Partial.cs
@@ -2004,7 +2004,7 @@ private void OnIsTodayHighlightedPropertyChanged()
 							bool isTodayHighlighted = false;
 
 							isTodayHighlighted = IsTodayHighlighted;
-							((CalendarViewBaseItem)spChildAsI).SetIsToday(!isTodayHighlighted);
+							((CalendarViewBaseItem)spChildAsI).SetIsToday(isTodayHighlighted);
 						}
 					}
 				}
@@ -2021,7 +2021,7 @@ private void OnIsOutOfScopePropertyChanged()
 			// when IsOutOfScopeEnabled property is false, we don't care about scope state (all are inScope),
 			// so we don't need to hook to ScrollViewer's state change handler.
 			// when IsOutOfScopeEnabled property is true, we need to do so.
-			if (m_areDirectManipulationStateChangeHandlersHooked != !isOutOfScopeEnabled)
+			if (m_areDirectManipulationStateChangeHandlersHooked != isOutOfScopeEnabled)
 			{
 				m_areDirectManipulationStateChangeHandlersHooked = !m_areDirectManipulationStateChangeHandlersHooked;
 
@@ -2252,7 +2252,7 @@ private void OnIsLabelVisibleChanged()
 					ForeachChildInPanel(pPanel, 
 						(CalendarViewBaseItem pItem) =>
 					{
-						pHost.UpdateLabel(pItem, !isLabelVisible);
+						pHost.UpdateLabel(pItem, isLabelVisible);
 					});
 				}
 			}

diff --git a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarView_Partial_Selection.cs b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarView_Partial_Selection.cs
@@ -388,7 +388,7 @@ internal void IsSelected(DateTime date, out bool pIsSelected)
 
 			found = m_tpSelectedDates.IndexOf(date, out index);
 
-			pIsSelected = !!found;
+			pIsSelected = found;
 
 		}
 

diff --git a/src/Uno.UI/UI/Xaml/Controls/DatePicker/DateTimePickerFlyoutHelper.cs b/src/Uno.UI/UI/Xaml/Controls/DatePicker/DateTimePickerFlyoutHelper.cs
@@ -193,7 +193,7 @@ internal static void OnKeyDownImpl(
 					}
 				}
 
-				pEventArgs.Handled = !!focusChanged;
+				pEventArgs.Handled = focusChanged;
 			}
 
 			return;