RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make QMenuBar on Linux work without private API

This commit is contained in:
Ilya Fedin 2022-05-20 23:33:14 +04:00 committed by John Preston
parent 088cca7452
commit 4410aeb3eb
1 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View File

@ -45,9 +45,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtGui/QWindow>
#include <QtWidgets/QMenuBar>
#include <private/qguiapplication_p.h>
#include <private/qaction_p.h>
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
#include <glibmm.h>
#include <giomm.h>
@ -157,17 +154,14 @@ void SkipTaskbar(QWindow *window, bool skip) {
void SendKeySequence(
Qt::Key key,
Qt::KeyboardModifiers modifiers = Qt::NoModifier) {
const auto focused = QApplication::focusWidget();
const auto focused = static_cast<QObject*>(QApplication::focusWidget());
if (qobject_cast<QLineEdit*>(focused)
|| qobject_cast<QTextEdit*>(focused)
|| dynamic_cast<HistoryInner*>(focused)) {
QApplication::postEvent(
focused,
new QKeyEvent(QEvent::KeyPress, key, modifiers));
QApplication::postEvent(
focused,
new QKeyEvent(QEvent::KeyRelease, key, modifiers));
QKeyEvent pressEvent(QEvent::KeyPress, key, modifiers);
focused->event(&pressEvent);
QKeyEvent releaseEvent(QEvent::KeyRelease, key, modifiers);
focused->event(&releaseEvent);
}
}
@ -176,11 +170,6 @@ void ForceDisabled(QAction *action, bool disabled) {
if (disabled) action->setDisabled(true);
} else if (!disabled) {
action->setDisabled(false);
const auto privateAction = QActionPrivate::get(action);
privateAction->setShortcutEnabled(
false,
QGuiApplicationPrivate::instance()->shortcutMap);
}
}
@ -506,17 +495,6 @@ void MainWindow::createGlobalMenu() {
about->setMenuRole(QAction::AboutQtRole);
// avoid shadowing actual shortcuts by the menubar
for (const auto &child : psMainMenu->children()) {
const auto action = qobject_cast<QAction*>(child);
if (action) {
const auto privateAction = QActionPrivate::get(action);
privateAction->setShortcutEnabled(
false,
QGuiApplicationPrivate::instance()->shortcutMap);
}
}
updateGlobalMenu();
}