Skip to content

Commit

Permalink
chore: CI adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
@MartinZikmund
MartinZikmund committed Sep 26, 2024
1 parent 94a2fbb commit 9eea208
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 15 deletions.
36 changes: 21 additions & 15 deletions src/Uno.UI/UI/Xaml/Controls/ComboBox/ComboBox.partial.mux.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
using Windows.System;
using static DirectUI.ElevationHelper;

#if HAS_UNO_WINUI
using PointerDeviceType = Microsoft.UI.Input.PointerDeviceType;
#else
using PointerDeviceType = Windows.Devices.Input.PointerDeviceType;
#endif

namespace Microsoft.UI.Xaml.Controls;

partial class ComboBox
Expand Down Expand Up @@ -377,7 +383,7 @@ private void SetContentPresenter(int index, bool forceSelectionBoxToNull = false
//DataTemplateSelector spDataTemplateSelector;
//GeneratorPosition generatorPosition;

//Debug.Assert(!IsInline, "ContentPresenter is not used in inline mode.");
//global::System.Diagnostics.Debug.Assert(!IsInline, "ContentPresenter is not used in inline mode.");

//// Avoid reentrancy.
//if (m_preparingContentPresentersElement)
Expand Down Expand Up @@ -525,7 +531,7 @@ private void SetContentPresenter(int index, bool forceSelectionBoxToNull = false

internal void UpdateSelectionBoxItemProperties(int index)
{
Debug.Assert(IsInline, "When not in inline mode SetContentPresenter should be used instead of UpdateSelectionBoxItemProperties.");
global::System.Diagnostics.Debug.Assert(IsInline, "When not in inline mode SetContentPresenter should be used instead of UpdateSelectionBoxItemProperties.");

if (-1 == index)
{
Expand Down Expand Up @@ -584,7 +590,7 @@ protected override void ClearContainerForItemOverride(DependencyObject element,

if (!isItemsHostInvalid && sPassedElement == m_tpSwappedOutComboBoxItem)
{
Debug.Assert(!IsInline, "m_tpSwappedOutComboBoxItem is not used in inline mode.");
global::System.Diagnostics.Debug.Assert(!IsInline, "m_tpSwappedOutComboBoxItem is not used in inline mode.");
SetContentPresenter(-1);
}

Expand Down Expand Up @@ -684,7 +690,7 @@ private void OnIsDropDownOpenChanged()
{
var isDropDownOpen = IsDropDownOpen;

Debug.Assert(!(m_isDropDownClosing && !isDropDownOpen), "The drop down cannot already be closing if IsDropDownOpen was just changed to false.");
global::System.Diagnostics.Debug.Assert(!(m_isDropDownClosing && !isDropDownOpen), "The drop down cannot already be closing if IsDropDownOpen was just changed to false.");

m_skipFocusSuggestion = !isDropDownOpen;

Expand Down Expand Up @@ -1635,7 +1641,7 @@ private void PopupKeyDown(KeyRoutedEventArgs args)
case VirtualKey.Tab:
// Need to enable this to support focusing out of combobox using tab key.
bFocused = Focus(focusState);
Debug.Assert(bFocused, "Focus could not leave ComboBox.");
global::System.Diagnostics.Debug.Assert(bFocused, "Focus could not leave ComboBox.");

IsDropDownOpen = false;
break;
Expand Down Expand Up @@ -1758,7 +1764,7 @@ private void PopupKeyDown(KeyRoutedEventArgs args)
}
break;
default:
Debug.Assert(!handled);
global::System.Diagnostics.Debug.Assert(!handled);
break;
}

Expand Down Expand Up @@ -2264,7 +2270,7 @@ private void OnElementPopupChildGotFocus(
RoutedEventArgs pArgs)
{

global::System.Diagnostics.Debug.Assert(!IsSmallFormFactor, "OnElementPopupChildGotFocus is not used in small form factor mode");
global::System.Diagnostics.global::System.Diagnostics.Debug.Assert(!IsSmallFormFactor, "OnElementPopupChildGotFocus is not used in small form factor mode");

var hasFocus = HasFocus();
FocusChanged(hasFocus);
Expand All @@ -2275,7 +2281,7 @@ private void OnElementPopupChildLostFocus(
RoutedEventArgs pArgs)
{

global::System.Diagnostics.Debug.Assert(!IsSmallFormFactor, "OnElementPopupChildLostFocus is not used in small form factor mode");
global::System.Diagnostics.global::System.Diagnostics.Debug.Assert(!IsSmallFormFactor, "OnElementPopupChildLostFocus is not used in small form factor mode");

var hasFocus = HasFocus();
FocusChanged(hasFocus);
Expand All @@ -2286,7 +2292,7 @@ private void OnElementPopupChildPointerEntered(
PointerRoutedEventArgs pArgs)
{

global::System.Diagnostics.Debug.Assert(!IsSmallFormFactor, "OnElementPopupChildPointerEntered is not used in small form factor mode");
global::System.Diagnostics.global::System.Diagnostics.Debug.Assert(!IsSmallFormFactor, "OnElementPopupChildPointerEntered is not used in small form factor mode");

m_IsPointerOverPopup = true;
UpdateVisualState();
Expand All @@ -2298,7 +2304,7 @@ private void OnElementPopupChildPointerExited(
{

m_IsPointerOverPopup = false;
global::System.Diagnostics.Debug.Assert(!IsSmallFormFactor, "OnElementPopupChildPointerExited is not used in small form factor mode");
global::System.Diagnostics.global::System.Diagnostics.Debug.Assert(!IsSmallFormFactor, "OnElementPopupChildPointerExited is not used in small form factor mode");

UpdateVisualState();
}
Expand All @@ -2320,7 +2326,7 @@ private void OnElementPopupChildSizeChanged(
SizeChangedEventArgs pArgs)
{

global::System.Diagnostics.Debug.Assert(!IsSmallFormFactor, "OnElementPopupChildSizeChanged is not used in small form factor mode");
global::System.Diagnostics.global::System.Diagnostics.Debug.Assert(!IsSmallFormFactor, "OnElementPopupChildSizeChanged is not used in small form factor mode");

ArrangePopup(false);
}
Expand Down Expand Up @@ -2445,7 +2451,7 @@ private void OnCharacterReceived(UIElement pSender, CharacterReceivedRoutedEvent
{
// Space should have been handled by now because we handle the Space key in the KeyDown event handler.
// NOTE: The 2 below specifies the map type, and maps VK to CHAR
Debug.Assert(' ' != keyCode);
global::System.Diagnostics.Debug.Assert(' ' != keyCode);
}

if (!ShouldIgnoreKeyCode(keyCode))
Expand Down Expand Up @@ -2644,7 +2650,7 @@ private int SearchItemSourceIndex(char keyCode, bool startSearchFromCurrentIndex
searchIndex = 0;
}

global::System.Diagnostics.Debug.Assert(searchIndex >= 0);
global::System.Diagnostics.global::System.Diagnostics.Debug.Assert(searchIndex >= 0);

object item;
string strItem;
Expand Down Expand Up @@ -2968,7 +2974,7 @@ private bool IsChildOfTarget(

private void OverrideSelectedIndexForVisualStates(int selectedIndexOverride)
{
//Debug.Assert(!CanSelectMultiple);
//global::System.Diagnostics.Debug.Assert(!CanSelectMultiple);

ClearSelectedIndexOverrideForVisualStates();

Expand Down Expand Up @@ -3010,7 +3016,7 @@ private void OverrideSelectedIndexForVisualStates(int selectedIndexOverride)

private void ClearSelectedIndexOverrideForVisualStates()
{
//Debug.Assert(!CanSelectMultiple);
//global::System.Diagnostics.Debug.Assert(!CanSelectMultiple);

DependencyObject? container;
ComboBoxItem? comboBoxItem;
Expand Down
1 change: 1 addition & 0 deletions src/Uno.UI/UI/Xaml/Controls/Primitives/Selector.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Uno.Extensions.Specialized;
using Uno.UI.DataBinding;
using Uno.UI.Extensions;
using Uno.UI.Helpers;
using Uno.UI.Xaml.Input;
using Windows.Foundation.Collections;
using Windows.System;
Expand Down

0 comments on commit 9eea208

Please sign in to comment.