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

Jump to bottom

Raise ShortcutActions with the sender (tab, control) context #15773

Merged
merged 14 commits into from
Aug 24, 2023
Merged

Raise ShortcutActions with the sender (tab, control) context #15773

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e9a2df9
This is an interesting idea - allow us to send the Control that raise…
zadjii-msft Aug 17, 2022
c751e9c
Update for til/winrt
zadjii-msft Jul 26, 2023
d7d8668
This fixes #15734, but doesn't prevent us from being dumb in the future
zadjii-msft Jul 26, 2023
a60c633
this is promising
zadjii-msft Jul 26, 2023
b0a5fd5
hey this works too
zadjii-msft Jul 26, 2023
0a0c194
all of the tab actions
zadjii-msft Jul 27, 2023
c8f2d27
cleanup
zadjii-msft Jul 27, 2023
fd87c31
tests build again
zadjii-msft Aug 1, 2023
feaf8fb
Merge remote-tracking branch 'origin/main' into dev/migrie/f/action-d…
zadjii-msft Aug 1, 2023
442a768
2 TODO!s
zadjii-msft Aug 2, 2023
f2ac5a2
last of em
zadjii-msft Aug 2, 2023
a248a66
Merge branch 'main' into dev/migrie/f/action-dispatch-with-sender
zadjii-msft Aug 2, 2023
0c4fbba
Merge remote-tracking branch 'origin/main' into dev/migrie/f/action-d…
zadjii-msft Aug 24, 2023
e69f19b
nits
zadjii-msft Aug 24, 2023
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
10 changes: 5 additions & 5 deletions src/cascadia/LocalTests_TerminalApp/TabTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ namespace TerminalAppLocalTests

Log::Comment(NoThrowString().Format(L"Duplicate the first pane"));
result = RunOnUIThread([&page]() {
page->_SplitPane(SplitDirection::Automatic, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
page->_SplitPane(nullptr, SplitDirection::Automatic, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));

VERIFY_ARE_EQUAL(1u, page->_tabs.Size());
auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
Expand All @@ -535,7 +535,7 @@ namespace TerminalAppLocalTests

Log::Comment(NoThrowString().Format(L"Duplicate the pane, and don't crash"));
result = RunOnUIThread([&page]() {
page->_SplitPane(SplitDirection::Automatic, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
page->_SplitPane(nullptr, SplitDirection::Automatic, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));

VERIFY_ARE_EQUAL(1u, page->_tabs.Size());
auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
Expand Down Expand Up @@ -857,7 +857,7 @@ namespace TerminalAppLocalTests
// | 1 | 2 |
// | | |
// -------------------
page->_SplitPane(SplitDirection::Right, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
page->_SplitPane(nullptr, SplitDirection::Right, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
secondId = tab->_activePane->Id().value();
});
Sleep(250);
Expand All @@ -875,7 +875,7 @@ namespace TerminalAppLocalTests
// | 3 | |
// | | |
// -------------------
page->_SplitPane(SplitDirection::Down, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
page->_SplitPane(nullptr, SplitDirection::Down, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
// Split again to make the 3rd tab
thirdId = tab->_activePane->Id().value();
Expand All @@ -895,7 +895,7 @@ namespace TerminalAppLocalTests
// | 3 | 4 |
// | | |
// -------------------
page->_SplitPane(SplitDirection::Down, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
page->_SplitPane(nullptr, SplitDirection::Down, 0.5f, page->_MakePane(nullptr, page->_GetFocusedTab(), nullptr));
auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
fourthId = tab->_activePane->Id().value();
});
Expand Down
1 change: 1 addition & 0 deletions src/cascadia/LocalTests_TerminalApp/pch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,4 @@ Author(s):
#include "../../inc/DefaultSettings.h"

#include <cppwinrt_utils.h>
#include <til/winrt.h>
Loading
Loading