procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Fixed dead keys in photo / file caption input field #1418

Browse source 
Another attempt to fix dead keys input problem after main
window looses focus to popup menu or photo viewer #2007 #1074
This commit is contained in:
John Preston 2016-06-24 19:43:46 +03:00
parent 12c20faa44
commit f6af535f8f
5 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Telegram/SourceFiles/mainwindow.cpp
View file

@ -926,13 +926,26 @@ void MainWindow::layerHidden() {
setInnerFocus();
}
void MainWindow::onReActivate() {
if (auto w = App::wnd()) {
if (auto f = QApplication::focusWidget()) {
f->clearFocus();
}
w->windowHandle()->requestActivate();
w->activate();
if (auto f = QApplication::focusWidget()) {
f->clearFocus();
}
w->setInnerFocus();
}
}
void MainWindow::hideMediaview() {
if (_mediaView && !_mediaView->isHidden()) {
_mediaView->hide();
#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64
if (App::wnd()) {
App::wnd()->activateWindow();
}
onReActivate();
QTimer::singleShot(200, this, SLOT(onReActivate()));
#endif
}
}

2
Telegram/SourceFiles/mainwindow.h
View file

@ -282,6 +282,8 @@ public slots:
void onLogoutSure();
void updateGlobalMenu(); // for OS X top menu
void onReActivate();
void notifyUpdateAllPhotos();
void app_activateClickHandler(ClickHandlerPtr handler, Qt::MouseButton button);

8
Telegram/SourceFiles/ui/flatinput.cpp
View file

@ -765,11 +765,11 @@ void InputArea::startBorderAnimation() {
}
void InputArea::focusInEvent(QFocusEvent *e) {
_inner.setFocus();
QTimer::singleShot(0, &_inner, SLOT(setFocus()));
}
void InputArea::mousePressEvent(QMouseEvent *e) {
_inner.setFocus();
QTimer::singleShot(0, &_inner, SLOT(setFocus()));
}
void InputArea::contextMenuEvent(QContextMenuEvent *e) {
@ -1457,11 +1457,11 @@ void InputField::startBorderAnimation() {
}
void InputField::focusInEvent(QFocusEvent *e) {
_inner.setFocus();
QTimer::singleShot(0, &_inner, SLOT(setFocus()));
}
void InputField::mousePressEvent(QMouseEvent *e) {
_inner.setFocus();
QTimer::singleShot(0, &_inner, SLOT(setFocus()));
}
void InputField::contextMenuEvent(QContextMenuEvent *e) {

6
Telegram/SourceFiles/ui/flatinput.h
View file

@ -235,6 +235,12 @@ public:
bool hasFocus() const {
return _inner.hasFocus();
}
void setFocus() {
_inner.setFocus();
}
void clearFocus() {
_inner.clearFocus();
}
public slots:

5
Telegram/SourceFiles/ui/popupmenu.cpp
View file

@ -521,8 +521,9 @@ PopupMenu::~PopupMenu() {
clearActions(true);
delete _menu;
#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64
if (App::wnd()) {
App::wnd()->activateWindow();
if (auto w = App::wnd()) {
w->onReActivate();
QTimer::singleShot(200, w, SLOT(onReActivate()));
}
#endif
}