Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:48:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix window height reported by Window.geometryChanged() signal

Browse source
This commit is contained in:
David Rowe 2018-04-03 14:21:15 +12:00
parent 9dcef996c5
commit 63603ff97c
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/scripting/WindowScriptingInterface.cpp
View file

@ -51,7 +51,7 @@ WindowScriptingInterface::WindowScriptingInterface() {
} }
}); });
connect(qApp->getWindow(), &MainWindow::windowGeometryChanged, this, &WindowScriptingInterface::geometryChanged); connect(qApp->getWindow(), &MainWindow::windowGeometryChanged, this, &WindowScriptingInterface::onWindowGeometryChanged);
} }
WindowScriptingInterface::~WindowScriptingInterface() { WindowScriptingInterface::~WindowScriptingInterface() {
@ -397,6 +397,15 @@ int WindowScriptingInterface::getY() {
return qApp->getWindow()->y(); return qApp->getWindow()->y();
} }
void WindowScriptingInterface::onWindowGeometryChanged(const QRect& windowGeometry) {
auto geometry = windowGeometry;
auto menu = qApp->getPrimaryMenu();
if (menu) {
geometry.setHeight(geometry.height() - menu->geometry().height());
}
emit geometryChanged(geometry);
}
void WindowScriptingInterface::copyToClipboard(const QString& text) { void WindowScriptingInterface::copyToClipboard(const QString& text) {
if (QThread::currentThread() != qApp->thread()) { if (QThread::currentThread() != qApp->thread()) {
QMetaObject::invokeMethod(this, "copyToClipboard", Q_ARG(QString, text)); QMetaObject::invokeMethod(this, "copyToClipboard", Q_ARG(QString, text));

1
interface/src/scripting/WindowScriptingInterface.h
View file

@ -522,6 +522,7 @@ public slots:
void closeMessageBox(int id); void closeMessageBox(int id);
private slots: private slots:
void onWindowGeometryChanged(const QRect& geometry);
void onMessageBoxSelected(int button); void onMessageBoxSelected(int button);
void disconnectedFromDomain(); void disconnectedFromDomain();