Skip to content

Commit f74ee9a

Browse files
committed
Improve textbox reselection speed
1 parent 8e1fb2d commit f74ee9a

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

Signal-Windows/Controls/Conversation.xaml.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,11 @@ private async void TextBox_KeyDown(object sender, KeyRoutedEventArgs e)
290290
if (!SendingMessage)
291291
{
292292
SendingMessage = true;
293-
await GetMainPageVm().SendMessageButton_Click((TextBox)sender);
293+
bool sendMessageResult = await GetMainPageVm().SendMessageButton_Click(InputTextBox.Text);
294+
if (sendMessageResult)
295+
{
296+
InputTextBox.Text = string.Empty;
297+
}
294298
SendingMessage = false;
295299
}
296300
}
@@ -307,7 +311,12 @@ private void ScrollToBottom()
307311

308312
private async void SendMessageButton_Click(object sender, RoutedEventArgs e)
309313
{
310-
await GetMainPageVm().SendMessageButton_Click(InputTextBox);
314+
InputTextBox.Focus(FocusState.Programmatic);
315+
bool sendMessageResult = await GetMainPageVm().SendMessageButton_Click(InputTextBox.Text);
316+
if (sendMessageResult)
317+
{
318+
InputTextBox.Text = string.Empty;
319+
}
311320
}
312321

313322
private void InputTextBox_TextChanged(object sender, TextChangedEventArgs e)

Signal-Windows/ViewModels/MainPageViewModel.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,9 @@ internal void RepositionConversation(SignalConversation uiConversation)
144144
}
145145
}
146146

147-
internal async Task SendMessageButton_Click(TextBox messageTextBox)
147+
internal async Task<bool> SendMessageButton_Click(string text)
148148
{
149-
bool sendMessageResult = await SendMessage(messageTextBox.Text.Replace("\r", "\r\n"));
150-
if (sendMessageResult)
151-
{
152-
messageTextBox.Text = string.Empty;
153-
}
154-
messageTextBox.Focus(FocusState.Programmatic);
149+
return await SendMessage(text.Replace("\r", "\r\n"));
155150
}
156151

157152
internal void Deselect()

0 commit comments

Comments
 (0)