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

Display URI tooltip, render dashed/solid underline for links #7420

Merged
merged 49 commits into from
Sep 10, 2020
Merged

Display URI tooltip, render dashed/solid underline for links #7420

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
16720a0
osc 8 support for conhost and terminal
PankajBhojwani Aug 11, 2020
51bd477
Correctly gets buffer position on click now
PankajBhojwani Aug 11, 2020
d268322
small fixes
PankajBhojwani Aug 12, 2020
3090b1c
more small fixes
PankajBhojwani Aug 12, 2020
b81014e
Merge branch 'master' of https://github.com/microsoft/terminal into d…
PankajBhojwani Aug 12, 2020
015fb8f
tryna pass pipeline checks
PankajBhojwani Aug 12, 2020
4a74f83
send event upon hyperlink click, allow custom ids, remove obsolete re…
PankajBhojwani Aug 15, 2020
049ee61
text buffer tests
PankajBhojwani Aug 17, 2020
c18f32a
spell
PankajBhojwani Aug 17, 2020
bd74eff
output engine test
PankajBhojwani Aug 17, 2020
0327750
more tests
PankajBhojwani Aug 17, 2020
405066e
resolve conflict
PankajBhojwani Aug 17, 2020
5995275
fixes
PankajBhojwani Aug 18, 2020
409b358
some requested changes
PankajBhojwani Aug 18, 2020
dfc8771
more changes
PankajBhojwani Aug 18, 2020
c28d2a6
conflict resolution
PankajBhojwani Aug 19, 2020
8a105d7
bug fix
PankajBhojwani Aug 19, 2020
7e96737
small changes
PankajBhojwani Aug 21, 2020
e19fbe5
fixed hyperlink not working after resize
PankajBhojwani Aug 21, 2020
bc70439
fixes
PankajBhojwani Aug 21, 2020
9d65b32
noexcept
PankajBhojwani Aug 21, 2020
aefb2e0
more noexcept
PankajBhojwani Aug 21, 2020
d0de3d5
except
PankajBhojwani Aug 21, 2020
eb3cda5
optimize prune hyperlinks
PankajBhojwani Aug 21, 2020
63723e8
hyperlinks is not a recognized word??
PankajBhojwani Aug 21, 2020
01928d3
check ctrl first then shift
PankajBhojwani Aug 24, 2020
121f51c
fuzzer
PankajBhojwani Aug 24, 2020
52e5743
fix
PankajBhojwani Aug 24, 2020
d1b0e83
terminator, blank space fixes
PankajBhojwani Aug 25, 2020
82cc197
ctrl+shift when no uri updates selection
PankajBhojwani Aug 26, 2020
1bece75
hover tooltip
PankajBhojwani Aug 26, 2020
351e08d
remove dead code
PankajBhojwani Aug 27, 2020
0cbd9a2
border is now 1 cell big
PankajBhojwani Aug 27, 2020
9de05e3
change colour on hover
PankajBhojwani Aug 28, 2020
8cd678f
spell
PankajBhojwani Aug 28, 2020
3bd29ca
underline on hover
PankajBhojwani Aug 28, 2020
8477af0
small optimization
PankajBhojwani Aug 31, 2020
953b49a
remove manual cast
PankajBhojwani Aug 31, 2020
3b8393d
renaming
PankajBhojwani Sep 2, 2020
c00ec2e
conflict resolution
PankajBhojwani Sep 3, 2020
e36f271
format
PankajBhojwani Sep 3, 2020
9d4f15c
variable stroke refernce, double underline fix
PankajBhojwani Sep 3, 2020
593ed9e
Merge branch 'master' of https://github.com/microsoft/terminal into d…
PankajBhojwani Sep 3, 2020
26dd3de
renames
PankajBhojwani Sep 3, 2020
1dcc60e
remove unused method
PankajBhojwani Sep 3, 2020
c273160
add italic text
PankajBhojwani Sep 4, 2020
46a6ba5
localize run
PankajBhojwani Sep 4, 2020
f42fa17
fontstyle left in xaml file
PankajBhojwani Sep 4, 2020
11b055b
remove fontstyle from resw
PankajBhojwani Sep 4, 2020
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
2 changes: 1 addition & 1 deletion src/cascadia/TerminalControl/TermControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,7 +1261,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
if (!uri.empty())
{
// Update the tooltip with the URI
LinkTip().Content(winrt::box_value(uri));
HoveredUri().Text(uri);

// Set the border thickness so it covers the entire cell
const auto charSizeInPixels = CharacterDimensions();
Expand Down
9 changes: 8 additions & 1 deletion src/cascadia/TerminalControl/TermControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,14 @@
BorderBrush="Transparent">
<ToolTipService.ToolTip>
<ToolTip x:Name="LinkTip"
Placement="Mouse"/>
Placement="Mouse">
<TextBlock IsTextSelectionEnabled="True">
<Run x:Name="HoveredUri"/> <LineBreak />
<Run FontStyle="Italic"
Text="ctrl+click to follow link" >
PankajBhojwani marked this conversation as resolved.
Show resolved Hide resolved
</Run>
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</Border>
</Canvas>
Expand Down
1 change: 1 addition & 0 deletions src/cascadia/TerminalControl/pch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include <winrt/Windows.UI.Xaml.Controls.h>
#include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
#include <winrt/Windows.UI.Xaml.Data.h>
#include <winrt/Windows.Ui.Xaml.Documents.h>
#include <winrt/Windows.UI.Xaml.Media.h>
#include <winrt/Windows.UI.Xaml.Media.Imaging.h>
#include <winrt/Windows.UI.Xaml.Input.h>
Expand Down