d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 03:00:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1319 from Decodetalkers/menuhideonwayland

Browse source 
feat: hide all popup menus when press leftbutton on somewhere else
This commit is contained in:
DeepBlueV7.X 2023-01-28 12:15:54 +01:00 committed by GitHub
commit 3abb49c4a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/MessageView.qml
View file

@ -25,6 +25,14 @@ Item {
property string searchString: ""
// HACK: https://bugreports.qt.io/browse/QTBUG-83972, qtwayland cannot auto hide menu
Connections {
function onHideMenu() {
messageContextMenu.close()
}
target: MainWindow
}
ScrollBar {
id: scrollbar
parent: chat.parent

9
resources/qml/RoomList.qml
View file

@ -20,6 +20,15 @@ Page {
property int avatarSize: Math.ceil(fontMetrics.lineSpacing * 2.3)
property bool collapsed: false
// HACK: https://bugreports.qt.io/browse/QTBUG-83972, qtwayland cannot auto hide menu
Connections {
function onHideMenu() {
userInfoMenu.close()
roomContextMenu.close()
}
target: MainWindow
}
Component {
id: roomDirectoryComponent

8
resources/qml/TopBar.qml
View file

@ -30,6 +30,14 @@ Pane {
property string searchString: ""
// HACK: https://bugreports.qt.io/browse/QTBUG-83972, qtwayland cannot auto hide menu
Connections {
function onHideMenu() {
roomOptionsMenu.close()
}
target: MainWindow
}
onRoomIdChanged: {
searchString = "";
searchButton.searchActive = false;

12
src/MainWindow.cpp
View file

@ -359,6 +359,18 @@ MainWindow::event(QEvent *event)
return QQuickView::event(event);
}
// HACK: https://bugreports.qt.io/browse/QTBUG-83972, qtwayland cannot auto hide menu
void
MainWindow::mousePressEvent(QMouseEvent *event)
{
#if defined(Q_OS_LINUX)
if (QGuiApplication::platformName() == "wayland") {
emit hideMenu();
}
#endif
return QQuickView::mousePressEvent(event);
}
void
MainWindow::restoreWindowSize()
{

4
src/MainWindow.h
View file

@ -69,6 +69,8 @@ public:
protected:
void closeEvent(QCloseEvent *event);
bool event(QEvent *event) override;
// HACK: https://bugreports.qt.io/browse/QTBUG-83972, qtwayland cannot auto hide menu
void mousePressEvent(QMouseEvent *) override;
private slots:
//! Handle interaction with the tray icon.
@ -77,6 +79,8 @@ private slots:
virtual void setWindowTitle(int notificationCount);
signals:
// HACK: https://bugreports.qt.io/browse/QTBUG-83972, qtwayland cannot auto hide menu
void hideMenu();
void reload();
void secretsChanged();