Skip to content

Commit

Permalink
a bunch of notes before I abandon this
Browse files Browse the repository at this point in the history
  • Loading branch information
@zadjii-msft
zadjii-msft committed Aug 10, 2023
1 parent 33197c5 commit a1043ba
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 4 deletions.
26 changes: 25 additions & 1 deletion src/cascadia/TerminalApp/SuggestionsControl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,14 @@ namespace winrt::TerminalApp::implementation
_toolTipContent().Inlines().Append(textRun);
_toolTipContent().Inlines().Append(Documents::LineBreak{});
}

// TODO! These were all feigned attempts to allow us to focus the content of the teachingtip.
// We may want to keep IsTextSelectionEnabled in the XAML.
//
// I also have no idea if the FullDescriptionProperty thing worked at all.
_toolTipContent().AllowFocusOnInteraction(true);
_toolTipContent().IsTextSelectionEnabled(true);
DescriptionTip().SetValue(Automation::AutomationProperties::FullDescriptionProperty(), winrt::box_value(description));
}
co_return;
}
Expand Down Expand Up @@ -446,7 +454,9 @@ namespace winrt::TerminalApp::implementation
// If the user types a character while the menu (not in palette mode)
// is open, then dismiss ourselves. That way, when you type a character,
// we'll instead send it to the TermControl.
if (_mode == SuggestionsMode::Menu && !e.Handled())
if (_mode == SuggestionsMode::Menu &&
!e.Handled() &&
key != VirtualKey::F6)
{
_dismissPalette();
}
Expand Down Expand Up @@ -513,7 +523,21 @@ namespace winrt::TerminalApp::implementation
return;
}

const auto& popups = Media::VisualTreeHelper::GetOpenPopupsForXamlRoot(root);
const auto numPopups = popups.Size();
// TODO! I think _we_ are the first popup.
if (numPopups > 1)
{
// TODO! a test. If theres a popup, don't dismiss.
return;
}

// TODO! if the teaching tip is closed, re-focus the suggestions list

auto focusedElementOrAncestor = Input::FocusManager::GetFocusedElement(root).try_as<DependencyObject>();
// TODO! if there wasn't a focused element in the main root, look
// instead underneath the teachingtip. left as an exersize to figure out
// _how_ to do that.
while (focusedElementOrAncestor)
{
if (focusedElementOrAncestor == *this)
Expand Down
4 changes: 1 addition & 3 deletions src/cascadia/TerminalApp/SuggestionsControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,9 @@
SelectionChanged="_listItemSelectionChanged"
SelectionMode="Single" />
<mux:TeachingTip x:Name="DescriptionTip"
Title=""
IsOpen="False"
PreferredPlacement="Right"
ShouldConstrainToRootBounds="False"
Subtitle="">
ShouldConstrainToRootBounds="False">
<ScrollViewer HorizontalScrollBarVisibility="Hidden"
HorizontalScrollMode="Enabled">
<TextBlock x:Name="_toolTipContent" />
Expand Down

1 comment on commit a1043ba

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@check-spelling-bot Report

🔴 Please review

See the 📜action log for details.

Unrecognized words (2)

exersize
teachingtip

Previously acknowledged words that are now absent countof cpprest homeglyphs keyevent ONLCR OSCBG OSCCT OSCFG OSCRCC OSCSCB OSCSCC OSCWT pplx pseudocode testdlls Tlgdata websockets xxyyzz :arrow_right:
To accept ✔️ these unrecognized words as correct and remove the previously acknowledged and now absent words, run the following commands

... in a clone of the git@github.com:microsoft/terminal.git repository
on the dev/migrie/f/3121-tooltips branch (ℹ️ how do I use this?):

curl -s -S -L 'https://raw.githubusercontent.com/check-spelling/check-spelling/v0.0.21/apply.pl' |
perl - 'https://github.com/microsoft/terminal/actions/runs/5823617933/attempts/1'
✏️ Contributor please read this

By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.

⚠️ The command is written for posix shells. If it doesn't work for you, you can manually add (one word per line) / remove items to expect.txt and the excludes.txt files.

If the listed items are:

  • ... misspelled, then please correct them instead of using the command.
  • ... names, please add them to .github/actions/spelling/allow/names.txt.
  • ... APIs, you can add them to a file in .github/actions/spelling/allow/.
  • ... just things you're using, please add them to an appropriate file in .github/actions/spelling/expect/.
  • ... tokens you only need in one place and shouldn't generally be used, you can add an item in an appropriate file in .github/actions/spelling/patterns/.

See the README.md in each directory for more information.

🔬 You can test your commits without appending to a PR by creating a new branch with that extra change and pushing it to your fork. The check-spelling action will run in response to your push -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. 😉

If the flagged items are 🤯 false positives

If items relate to a ...

  • binary file (or some other file you wouldn't want to check at all).

    Please add a file path to the excludes.txt file matching the containing file.

    File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

    ^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

  • well-formed pattern.

    If you can write a pattern that would match it,
    try adding it to the patterns.txt file.

    Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

    Note that patterns can't match multiline strings.

Please sign in to comment.