-
Notifications
You must be signed in to change notification settings - Fork 8.4k
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.
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
Add an experimental "scratchpad pane", for testing #16171
Merged
+134
−1
Merged
Changes from 59 commits
Commits
Show all changes
63 commits
Select commit
Hold shift + click to select a range
f353323
I wanted to do this in one shot but _zelda_
zadjii-msft 4e14442
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-te…
zadjii-msft ef6bb8a
hey look, it builds now
zadjii-msft 5b3aa54
move GetNewTerminalArgs into IPaneContent
zadjii-msft 84df819
close event
zadjii-msft 7c9ffb0
snapping now uses an interface, so that it's not TermControl-specific
zadjii-msft a1da6c1
huge shuffling so that pane content can raise events instead of relyi…
zadjii-msft 049c043
some last cleanups
zadjii-msft 2dd8f40
[TO PARENT] dead code
zadjii-msft 1b39db7
Single commit that adds the whole scratchpad and action
zadjii-msft 63ba8e1
[PARENT] You know what, I just went for it.
zadjii-msft 262d95a
[PARENT] try to use GetActiveTerminalControl less in TerminalTab
zadjii-msft 2d40306
Let's just make it experimental
zadjii-msft e6dc314
Merge commit 'b4042ea' into dev/migrie/fhl/non-terminal-panes-2023
zadjii-msft e31202b
Merge commit '6a10ea5' into dev/migrie/fhl/non-terminal-panes-2023
zadjii-msft 11126f9
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-te…
zadjii-msft 5f9add4
Merge branch 'dev/migrie/fhl/non-terminal-panes-2023' into dev/migrie…
zadjii-msft a23c1a2
keybindings too
zadjii-msft 5582e1b
[PARENT] You know what, I just went for it.
zadjii-msft f89368c
[PARENT] try to use GetActiveTerminalControl less in TerminalTab
zadjii-msft e0b003a
Merge branch 'main' into dev/migrie/fhl/non-terminal-panes-2023
zadjii-msft 86914bd
Merge branch 'dev/migrie/fhl/non-terminal-panes-2023' into dev/migrie…
zadjii-msft 1cc9835
feature flags too
zadjii-msft c869b47
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-te…
zadjii-msft 46469aa
Merge branch 'dev/migrie/fhl/non-terminal-panes-2023' into dev/migrie…
zadjii-msft 2086e0f
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-te…
zadjii-msft b49997b
Merge branch 'dev/migrie/fhl/non-terminal-panes-2023' into dev/migrie…
zadjii-msft 81889a6
derp
zadjii-msft fd06409
annoying build break
zadjii-msft 8df9523
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-te…
zadjii-msft 58e8f3c
mostly nits
zadjii-msft e9e04d4
Merge branch 'dev/migrie/fhl/non-terminal-panes-2023' into dev/migrie…
zadjii-msft 7bc1457
nits and such
zadjii-msft cf920e7
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-te…
zadjii-msft 4cec7e9
try to remove a few of these but ultimately, eh
zadjii-msft f622d80
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-te…
zadjii-msft 6bc711d
maybe I'm not that good at coding
zadjii-msft 0d528f8
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-te…
zadjii-msft 3982358
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-te…
zadjii-msft c244633
Merge branch 'dev/migrie/fhl/non-terminal-panes-2023' into dev/migrie…
zadjii-msft de5f7af
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-te…
zadjii-msft 25a8851
Merge branch 'dev/migrie/fhl/non-terminal-panes-2023' into dev/migrie…
zadjii-msft a3fbc64
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-te…
zadjii-msft 35651bc
Merge branch 'dev/migrie/fhl/non-terminal-panes-2023' into dev/migrie…
zadjii-msft ef775a8
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-te…
zadjii-msft 524d658
GREAT-GREAT-GRANDPARENT: Hey when a pane wants to get closed, we shou…
zadjii-msft 1951f30
Merge branch 'dev/migrie/fhl/non-terminal-panes-2023' into dev/migrie…
zadjii-msft 6789ec0
some of the easier nits
zadjii-msft fd8b083
get rid of this file
zadjii-msft 052dc78
more nits
zadjii-msft a7533fa
eh these events are from pane content anyways!
zadjii-msft 826fc08
hey there buddy, did you get lost?
zadjii-msft 52970ef
RegisterBigTimeEncapsulationViolatingTerminalPaneContentEvents
zadjii-msft 2357653
Merge branch 'dev/migrie/fhl/non-terminal-panes-2023' into dev/migrie…
zadjii-msft e0bb840
Fix scratch pane for merge
zadjii-msft 2083b2f
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-te…
zadjii-msft f1ab16e
Merge branch 'dev/migrie/fhl/non-terminal-panes-2023' into dev/migrie…
zadjii-msft df73d75
derp
zadjii-msft d417934
Merge branch 'dev/migrie/fhl/non-terminal-panes-2023' into dev/migrie…
zadjii-msft 61e952c
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-te…
zadjii-msft 0979cd6
Merge branch 'dev/migrie/fhl/non-terminal-panes-2023' into dev/migrie…
zadjii-msft b6e4b62
Doesn't really need to be projected
zadjii-msft 1d20599
un fix this file
zadjii-msft File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT license. | ||
|
||
namespace TerminalApp | ||
{ | ||
|
||
runtimeclass BellEventArgs | ||
{ | ||
Boolean FlashTaskbar { get; }; | ||
}; | ||
|
||
interface IPaneContent | ||
{ | ||
Windows.UI.Xaml.FrameworkElement GetRoot(); | ||
|
||
Windows.Foundation.Size MinimumSize { get; }; | ||
|
||
String Title { get; }; | ||
UInt64 TaskbarState { get; }; | ||
UInt64 TaskbarProgress { get; }; | ||
Boolean ReadOnly { get; }; | ||
|
||
Microsoft.Terminal.Settings.Model.NewTerminalArgs GetNewTerminalArgs(Boolean asContent); | ||
|
||
void Focus(Windows.UI.Xaml.FocusState reason); | ||
|
||
void Close(); | ||
|
||
event Windows.Foundation.TypedEventHandler<IPaneContent, Object> CloseRequested; | ||
|
||
event Windows.Foundation.TypedEventHandler<Object, Object> ConnectionStateChanged; | ||
event Windows.Foundation.TypedEventHandler<IPaneContent, BellEventArgs> BellRequested; | ||
event Windows.Foundation.TypedEventHandler<IPaneContent, Object> TitleChanged; | ||
event Windows.Foundation.TypedEventHandler<IPaneContent, Object> TabColorChanged; | ||
event Windows.Foundation.TypedEventHandler<IPaneContent, Object> TaskbarProgressChanged; | ||
event Windows.Foundation.TypedEventHandler<IPaneContent, Object> ReadOnlyChanged; | ||
event Windows.Foundation.TypedEventHandler<IPaneContent, Object> FocusRequested; | ||
}; | ||
|
||
|
||
enum PaneSnapDirection | ||
{ | ||
Width, | ||
Height | ||
}; | ||
|
||
interface ISnappable | ||
{ | ||
Single SnapDownToGrid(PaneSnapDirection direction, Single sizeToSnap); | ||
Windows.Foundation.Size GridUnitSize { get; }; | ||
}; | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've got a few questions about actions:
I'm having a hard time understanding where the line is between "full blown text editor" and "text box in a pane", so I'm ok with you rejecting some of the ideas above. That said, I think a few of them (namely copy, paste, and font size [maybe searchWeb, but that one I care less about tbh]) are important.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ctrl+shift+c
just works for a TextBox too), but I don't think bindingcopy
toctrl+q
or something weird will.experimental
.It's a text box in a pane, literally nothing more. I'm not promising any more either, it's really just for testing
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<dustin voice>we should have some sort of notion of what actions work where - like, searchWeb right now requires an actual TermControl to be the focused thing. ClosePane only really needs a Pane. A concept of what actions work on what layers, etc, etc.</dustin>
Pretty sure we've all discussed that to death. We've all accepted it's a good idea, but not something to block this over. Incremental progress baby.