Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Captured pointer for SwapChainPanel and ScrollBar separately #1248

Merged
merged 4 commits into from
Jun 18, 2019
Merged

Captured pointer for SwapChainPanel and ScrollBar separately #1248

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a880f73
Captured pointer for SwapChainPanel and ScrollBar separately
carlos-zamora Jun 13, 2019
01717f3
forgot to format (again) :(
carlos-zamora Jun 13, 2019
4124a5a
PR changes
carlos-zamora Jun 13, 2019
e530944
fixed my derp
carlos-zamora Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 36 additions & 6 deletions src/cascadia/TerminalControl/TermControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,8 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
_scrollBar.Value(0);
_scrollBar.ViewportSize(bufferHeight);
_scrollBar.ValueChanged({ this, &TermControl::_ScrollbarChangeHandler });
_scrollBar.PointerPressed({ this, &TermControl::_CapturePointer });
_scrollBar.PointerReleased({ this, &TermControl::_ReleasePointer });

// Apply settings for scrollbar
if (_settings.ScrollState() == ScrollbarState::Visible)
Expand All @@ -499,9 +501,9 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
}

_root.PointerWheelChanged({ this, &TermControl::_MouseWheelHandler });
_root.PointerPressed({ this, &TermControl::_MouseClickHandler });
_root.PointerMoved({ this, &TermControl::_MouseMovedHandler });
_root.PointerReleased({ this, &TermControl::_PointerReleasedHandler });
_swapChainPanel.PointerPressed({ this, &TermControl::_PointerPressedHandler });
zadjii-msft marked this conversation as resolved.
Show resolved Hide resolved
_swapChainPanel.PointerMoved({ this, &TermControl::_PointerMovedHandler });
_swapChainPanel.PointerReleased({ this, &TermControl::_PointerReleasedHandler });

localPointerToThread->EnablePainting();

Expand Down Expand Up @@ -671,9 +673,11 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
// Arguments:
// - sender: not used
zadjii-msft marked this conversation as resolved.
Show resolved Hide resolved
// - args: event data
void TermControl::_MouseClickHandler(Windows::Foundation::IInspectable const& /*sender*/,
void TermControl::_PointerPressedHandler(Windows::Foundation::IInspectable const& sender,
Input::PointerRoutedEventArgs const& args)
zadjii-msft marked this conversation as resolved.
Show resolved Hide resolved
{
_CapturePointer(sender, args);

const auto ptr = args.Pointer();
const auto point = args.GetCurrentPoint(_root);

Expand Down Expand Up @@ -740,7 +744,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
// Arguments:
// - sender: not used
// - args: event data
void TermControl::_MouseMovedHandler(Windows::Foundation::IInspectable const& /*sender*/,
void TermControl::_PointerMovedHandler(Windows::Foundation::IInspectable const& /*sender*/,
Input::PointerRoutedEventArgs const& args)
{
const auto ptr = args.Pointer();
Expand Down Expand Up @@ -801,9 +805,11 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
// - args: event data
// Return Value:
// - <none>
void TermControl::_PointerReleasedHandler(Windows::Foundation::IInspectable const& /*sender*/,
void TermControl::_PointerReleasedHandler(Windows::Foundation::IInspectable const& sender,
Input::PointerRoutedEventArgs const& args)
{
_ReleasePointer(sender, args);

const auto ptr = args.Pointer();

if (ptr.PointerDeviceType() == Windows::Devices::Input::PointerDeviceType::Touch)
Expand Down Expand Up @@ -949,6 +955,30 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
}
}

// Method Description:
// - captures the pointer so that none of the other XAML elements respond to pointer events
// Arguments:
// - sender: XAML element that is interacting with pointer
// - args: pointer data (i.e.: mouse, touch)
void TermControl::_CapturePointer(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& args)
{
IUIElement uielem;
sender.as(uielem);
zadjii-msft marked this conversation as resolved.
Show resolved Hide resolved
uielem.CapturePointer(args.Pointer());
}

// Method Description:
// - releases the captured pointer because we're done responding to XAML pointer events
// Arguments:
// - sender: XAML element that is interacting with pointer
// - args: pointer data (i.e.: mouse, touch)
void TermControl::_ReleasePointer(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& args)
{
IUIElement uielem;
sender.as(uielem);
uielem.ReleasePointerCapture(args.Pointer());
}

// Method Description:
// - Event handler for the GotFocus event. This is used to start
// blinking the cursor when the window is focused.
Expand Down
6 changes: 4 additions & 2 deletions src/cascadia/TerminalControl/TermControl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,13 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
void _UpdateFont();
void _KeyDownHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e);
void _CharacterHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::CharacterReceivedRoutedEventArgs const& e);
void _MouseClickHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
void _MouseMovedHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
void _PointerPressedHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
void _PointerMovedHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
void _PointerReleasedHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
void _MouseWheelHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
void _ScrollbarChangeHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Controls::Primitives::RangeBaseValueChangedEventArgs const& e);
void _CapturePointer(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
void _ReleasePointer(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
void _GotFocusHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
void _LostFocusHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);

Expand Down