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.

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

#459 IME UI does not follow the cursor in Windows Terminal #1919

Merged
merged 33 commits into from
Nov 22, 2019
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b57310d
Add TSF3.0 IME UserControl
Jun 20, 2019
17b624d
Trying to figure out why Surface Pro 6 isn't working right
Jul 8, 2019
1a69d5c
Add documentation, getting ready for review
Jul 9, 2019
77c6197
Minor code formatting updates
Jul 9, 2019
466fd96
More changes to get ready for draft PR
Jul 9, 2019
078c69f
Add Exception handling around std::wstring operations
Jul 9, 2019
3a097ca
Add TSF3.0 IME UserControl
Jun 20, 2019
578578c
Trying to figure out why Surface Pro 6 isn't working right
Jul 8, 2019
882e97f
Add documentation, getting ready for review
Jul 9, 2019
28e99d0
Minor code formatting updates
Jul 9, 2019
b890187
More changes to get ready for draft PR
Jul 9, 2019
4cec73a
Add Exception handling around std::wstring operations
Jul 9, 2019
8309559
Merge branch 'dev/philnach/459-TSF30-IME_2' of https://github.com/phi…
Jul 10, 2019
f309dfe
Removing Outputdebugstrings
Jul 10, 2019
2afe5f3
Apply Formatting fixes that caused code formatting failures
Jul 11, 2019
ebf3d8c
The FontWidth and Height properties weren't used on the TSFInputControl
Jul 11, 2019
41a373b
applying const to where appropriate
philnach Jul 25, 2019
c3c42e9
Merging with upstream
Oct 23, 2019
35c456a
Fix incorrect merge
Oct 23, 2019
f9e3ab9
More const changes
Nov 19, 2019
714d00a
Merge branch 'master' into dev/philnach/459-TSF30-IME_2
Nov 19, 2019
39aea27
Code Analysis Errors
Nov 19, 2019
cec486a
Remove TAB OFFSET Hack
Nov 20, 2019
e781a85
Add GitHub issues for all TODOs in TSFInputControl
Nov 20, 2019
a1b5c3a
Add more TODO github linked issues
Nov 20, 2019
8354fc1
Fix Code Formatting errors
Nov 20, 2019
30bfc3e
Update src/cascadia/TerminalControl/TSFInputControl.cpp
philnach Nov 21, 2019
04d1a63
Move Color conversion to WinRT Utils library
Nov 21, 2019
facb878
Add missing file header
Nov 21, 2019
d2a0ae8
Address PR feedback, switched to TYPED_EVENT, newer Exception Macro, …
Nov 21, 2019
4bafb32
Switch to GETSET_PROPERTY macro
Nov 21, 2019
9108b41
Adjust fontsize as supposed to fixed size
Nov 21, 2019
12c1ac6
LogicalDPI was not the right call it's always 96
Nov 21, 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
Prev Previous commit
Next Next commit
Apply Formatting fixes that caused code formatting failures
  • Loading branch information
Phil Nachreiner committed Jul 11, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 2afe5f3c516a8d31e0ea952a4041992d98547082
4 changes: 2 additions & 2 deletions src/cascadia/TerminalControl/TSFInputControl.h
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
public CursorPositionEventArgsT<CursorPositionEventArgs>
{
public:
CursorPositionEventArgs() {};
CursorPositionEventArgs(){};

Windows::Foundation::Point CurrentPosition()
philnach marked this conversation as resolved.
Show resolved Hide resolved
{
@@ -30,7 +30,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
public FontInfoEventArgsT<FontInfoEventArgs>
{
public:
FontInfoEventArgs() {};
FontInfoEventArgs(){};

Windows::Foundation::Point FontSize()
{
13 changes: 6 additions & 7 deletions src/cascadia/TerminalControl/TermControl.cpp
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
_touchAnchor{ std::nullopt },
_leadingSurrogate{},
_cursorTimer{},
_tsfInputControl { nullptr }
_tsfInputControl{ nullptr }
{
_Create();
}
@@ -1017,7 +1017,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
return;
}
_focused = true;

if (_tsfInputControl != nullptr)
{
_tsfInputControl.NotifyFocusEnter();
@@ -1588,7 +1588,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
// - Composition Completion handler for the TSFInputControl that
// handles writing text out to TerminalConnection
// Arguments:
// - text: the text to write to TerminalConnection
// - text: the text to write to TerminalConnection
// Return Value:
// - <none>
void TermControl::_CompositionCompleted(winrt::hstring text)
@@ -1625,13 +1625,12 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
eventArgs.FontFace(_actualFont.GetFaceName());
}


// -------------------------------- WinRT Events ---------------------------------
// Winrt events need a method for adding a callback to the event and removing the callback.
// These macros will define them both for you.
DEFINE_EVENT(TermControl, TitleChanged, _titleChangedHandlers, TerminalControl::TitleChangedEventArgs);
DEFINE_EVENT(TermControl, ConnectionClosed, _connectionClosedHandlers, TerminalControl::ConnectionClosedEventArgs);
DEFINE_EVENT(TermControl, CopyToClipboard, _clipboardCopyHandlers, TerminalControl::CopyToClipboardEventArgs);
DEFINE_EVENT(TermControl, TitleChanged, _titleChangedHandlers, TerminalControl::TitleChangedEventArgs);
DEFINE_EVENT(TermControl, ConnectionClosed, _connectionClosedHandlers, TerminalControl::ConnectionClosedEventArgs);
DEFINE_EVENT(TermControl, CopyToClipboard, _clipboardCopyHandlers, TerminalControl::CopyToClipboardEventArgs);
DEFINE_EVENT(TermControl, ScrollPositionChanged, _scrollPositionChangedHandlers, TerminalControl::ScrollPositionChangedEventArgs);
// clang-format on