Skip to content

Commit

Permalink
Merge pull request #4130 from Microsoft/prerelease/2.0.0.rc1.refresh_…
Browse files Browse the repository at this point in the history
…stabilization

Bring the RC1 Refresh payload into mrtk_release
  • Loading branch information
chrisfromwork authored May 1, 2019
2 parents 4506767 + 6a2bffb commit 895c408
Show file tree
Hide file tree
Showing 533 changed files with 23,055 additions and 4,557 deletions.
23 changes: 19 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
Overview
---
## Overview


Changes
---
## Changes
- Fixes: # .


## Verification
> This optional section is a place where you can detail the specific type of verification
> you want from reviewers. For example, if you want reviewers to checkout the PR locally
> and validate the functionality of specific scenarios, provide instructions
> on the specific scenarios and what you want verified.
>
> If there are specific areas of concern or question feel free to highlight them here so
> that reviewers can watch out for those issues.
>
> As a reviewer, it is possible to check out this change locally by using the following
> commands (substituting {PR_ID} with the ID of this pull request):
>
> git fetch origin pull/{PR_ID}/head:name_of_local_branch
>
> git checkout name_of_local_branch
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ public void OnPointerClicked(MixedRealityPointerEventData eventData)
public void OnPointerDown(MixedRealityPointerEventData eventData)
{ }

/// <summary>
/// This script does not handle pointer dragged events.
/// </summary>
public void OnPointerDragged(MixedRealityPointerEventData eventData) { }

/// <summary>
/// This script does not handle pointer up events.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ void IMixedRealityPointerHandler.OnPointerDown(MixedRealityPointerEventData even
}
}

void IMixedRealityPointerHandler.OnPointerDragged(MixedRealityPointerEventData eventData) { }

void IMixedRealityPointerHandler.OnPointerClicked(MixedRealityPointerEventData eventData) { }
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
using Microsoft.MixedReality.Toolkit.Input;
using Microsoft.MixedReality.Toolkit.Utilities;
using System.Collections;
Expand Down Expand Up @@ -548,6 +547,8 @@ void IMixedRealityPointerHandler.OnPointerDown(MixedRealityPointerEventData even
isZooming = true;
}

void IMixedRealityPointerHandler.OnPointerDragged(MixedRealityPointerEventData eventData) { }

void IMixedRealityPointerHandler.OnPointerClicked(MixedRealityPointerEventData eventData) { }

void IMixedRealityFocusHandler.OnFocusEnter(FocusEventData eventData)
Expand Down
Loading

0 comments on commit 895c408

Please sign in to comment.