mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2025-09-24 11:44:59 -04:00
Merge 9bb67b89b8c15022ef094e7d3db0d50360da6413 into 6aa728b12a8f6750ac2115635fd070621137d675
This commit is contained in:
commit
593c47107a
@ -832,6 +832,8 @@ SET(LAUNCHER_SOURCES
|
|||||||
ui/InstanceWindow.cpp
|
ui/InstanceWindow.cpp
|
||||||
ui/ViewLogWindow.h
|
ui/ViewLogWindow.h
|
||||||
ui/ViewLogWindow.cpp
|
ui/ViewLogWindow.cpp
|
||||||
|
ui/ToolTipFilter.h
|
||||||
|
ui/ToolTipFilter.cpp
|
||||||
|
|
||||||
# FIXME: maybe find a better home for this.
|
# FIXME: maybe find a better home for this.
|
||||||
FileIgnoreProxy.cpp
|
FileIgnoreProxy.cpp
|
||||||
|
@ -93,6 +93,7 @@
|
|||||||
|
|
||||||
#include "ui/GuiUtil.h"
|
#include "ui/GuiUtil.h"
|
||||||
#include "ui/ViewLogWindow.h"
|
#include "ui/ViewLogWindow.h"
|
||||||
|
#include "ui/ToolTipFilter.h"
|
||||||
#include "ui/dialogs/AboutDialog.h"
|
#include "ui/dialogs/AboutDialog.h"
|
||||||
#include "ui/dialogs/CopyInstanceDialog.h"
|
#include "ui/dialogs/CopyInstanceDialog.h"
|
||||||
#include "ui/dialogs/CreateShortcutDialog.h"
|
#include "ui/dialogs/CreateShortcutDialog.h"
|
||||||
@ -234,6 +235,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
|
|||||||
// does not implement decorations
|
// does not implement decorations
|
||||||
if (qgetenv("XDG_CURRENT_DESKTOP") == "gamescope") {
|
if (qgetenv("XDG_CURRENT_DESKTOP") == "gamescope") {
|
||||||
ui->mainToolBar->addAction(ui->actionCloseWindow);
|
ui->mainToolBar->addAction(ui->actionCloseWindow);
|
||||||
|
qApp->installEventFilter(new ToolTipFilter);
|
||||||
}
|
}
|
||||||
|
|
||||||
ui->actionViewJavaFolder->setEnabled(BuildConfig.JAVA_DOWNLOADER_ENABLED);
|
ui->actionViewJavaFolder->setEnabled(BuildConfig.JAVA_DOWNLOADER_ENABLED);
|
||||||
|
9
launcher/ui/ToolTipFilter.cpp
Normal file
9
launcher/ui/ToolTipFilter.cpp
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
#include "ToolTipFilter.h"
|
||||||
|
|
||||||
|
bool ToolTipFilter::eventFilter(QObject* obj, QEvent* ev) {
|
||||||
|
if (ev->type() == QEvent::ToolTip) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return QObject::eventFilter(obj, ev);
|
||||||
|
}
|
||||||
|
}
|
11
launcher/ui/ToolTipFilter.h
Normal file
11
launcher/ui/ToolTipFilter.h
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <qobject.h>
|
||||||
|
#include <qevent.h>
|
||||||
|
|
||||||
|
class ToolTipFilter : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
protected:
|
||||||
|
bool eventFilter(QObject *obj, QEvent *event);
|
||||||
|
};
|
Loading…
x
Reference in New Issue
Block a user