mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-01 07:05:13 +00:00
Code Issues Releases Wiki Activity

Don't switch chats on ctrl+shift+send (support).

Browse Source
This commit is contained in:
John Preston
2018-10-08 17:08:17 +03:00
parent 83919492d3
commit be6e329e94
10 changed files with 101 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Telegram/SourceFiles/support/support_autocomplete.cpp
View File

@@ -9,8 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/scroll_area.h"
#include "ui/widgets/input_fields.h"
#include "ui/widgets/buttons.h"
#include "ui/wrap/padding_wrap.h"
#include "support/support_templates.h"
#include "support/support_common.h"
#include "history/view/history_view_message.h"
#include "history/view/history_view_service_message.h"
#include "history/history_message.h"
@@ -66,7 +68,7 @@ private:
int _selected = -1;
int _pressed = -1;
bool _selectByKeys = false;
rpl::event_stream<> _activated;
rpl::event_stream<Qt::KeyboardModifiers> _activated;
};
@@ -252,7 +254,7 @@ void Inner::mousePressEvent(QMouseEvent *e) {
void Inner::mouseReleaseEvent(QMouseEvent *e) {
const auto pressed = base::take(_pressed);
if (pressed == _selected && pressed >= 0) {
_activated.fire({});
_activated.fire(e->modifiers());
}
}
@@ -373,9 +375,9 @@ void Autocomplete::setupContent() {
const auto inner = scroll->setOwnedWidget(object_ptr<Inner>(scroll));
const auto submit = [=] {
const auto submit = [=](Qt::KeyboardModifiers modifiers) {
if (const auto question = inner->selected()) {
submitValue(question->value);
submitValue(question->value, modifiers);
}
};
@@ -437,7 +439,9 @@ void Autocomplete::setupContent() {
}, lifetime());
}
void Autocomplete::submitValue(const QString &value) {
void Autocomplete::submitValue(
const QString &value,
Qt::KeyboardModifiers modifiers) {
const auto prefix = qstr("contact:");
if (value.startsWith(prefix)) {
const auto line = value.indexOf('\n');
@@ -457,7 +461,8 @@ void Autocomplete::submitValue(const QString &value) {
text,
phone,
firstName,
lastName });
lastName,
HandleSwitch(modifiers) });
}
} else {
_insertRequests.fire_copy(value);
@@ -468,7 +473,7 @@ ConfirmContactBox::ConfirmContactBox(
QWidget*,
not_null<History*> history,
const Contact &data,
Fn<void()> submit)
Fn<void(Qt::KeyboardModifiers)> submit)
: _comment(GenerateCommentItem(this, history, data))
, _contact(GenerateContactItem(this, history, data))
, _submit(submit) {
@@ -499,16 +504,34 @@ void ConfirmContactBox::prepare() {
setDimensions(width, height);
_contact->initDimensions();
addButton(langFactory(lng_send_button), [=] {
_submit = [=, original = std::move(_submit)](Qt::KeyboardModifiers m) {
const auto weak = make_weak(this);
_submit();
original(m);
if (weak) {
closeBox();
}
});
};
const auto button = addButton(langFactory(lng_send_button), [] {});
button->clicks(
) | rpl::start_with_next([=](Qt::MouseButton which) {
_submit((which == Qt::RightButton)
? SkipSwitchModifiers()
: button->clickModifiers());
}, button->lifetime());
button->setAcceptBoth(true);
addButton(langFactory(lng_cancel), [=] { closeBox(); });
}
void ConfirmContactBox::keyPressEvent(QKeyEvent *e) {
if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
_submit(e->modifiers());
} else {
BoxContent::keyPressEvent(e);
}
}
void ConfirmContactBox::paintEvent(QPaintEvent *e) {
Painter p(this);