Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-26 12:42:34 +01:00
Code Issues Projects Releases Activity

Implement basic invoke of native Mac bridge wrapper for screenplay window

Browse Source
This commit is contained in:
Dominik Louven 2018-11-27 11:34:09 +01:00
parent 1b9e20eebf
commit b0cd5bc984
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ScreenPlay/src/screenplay.h
View File

@ -96,6 +96,9 @@ public:
proArgs.append(parent->m_settings->decoder()); proArgs.append(parent->m_settings->decoder());
proArgs.append(QString::number(volume)); proArgs.append(QString::number(volume));
proArgs.append(fillMode); proArgs.append(fillMode);
qDebug() << proArgs;
m_process->setArguments(proArgs); m_process->setArguments(proArgs);
m_process->setProgram(parent->settings()->screenPlayWindowPath().toString()); m_process->setProgram(parent->settings()->screenPlayWindowPath().toString());
m_process->start(); m_process->start();

25
ScreenPlayWindow/src/SPWmainwindow.cpp
View File

@ -1,4 +1,5 @@
#include "SPWmainwindow.h" #include "SPWmainwindow.h"
#include "macintegration.h"
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
BOOL WINAPI SearchForWorkerWindow(HWND hwnd, LPARAM lparam) BOOL WINAPI SearchForWorkerWindow(HWND hwnd, LPARAM lparam)
@ -15,11 +16,13 @@ BOOL WINAPI SearchForWorkerWindow(HWND hwnd, LPARAM lparam)
} }
#endif #endif
//for mac https://github.com/silvansky/QtMacApp/search?q=myprivate&unscoped_q=myprivate
MainWindow::MainWindow(int i, QString projectPath, QString id, QString decoder, QString volume, QString fillmode, QScreen* parent) MainWindow::MainWindow(int i, QString projectPath, QString id, QString decoder, QString volume, QString fillmode, QScreen* parent)
: QWindow(parent) : QWindow(parent)
{ {
#ifdef Q_OS_WIN
m_appID = id; m_appID = id;
m_screenNumber.insert(0, i); m_screenNumber.insert(0, i);
@ -89,6 +92,8 @@ MainWindow::MainWindow(int i, QString projectPath, QString id, QString decoder,
} }
} }
#ifdef Q_OS_WIN
m_hwnd = (HWND)this->winId(); m_hwnd = (HWND)this->winId();
HWND progman_hwnd = FindWindowW(L"Progman", L"Program Manager"); HWND progman_hwnd = FindWindowW(L"Progman", L"Program Manager");
@ -116,6 +121,17 @@ MainWindow::MainWindow(int i, QString projectPath, QString id, QString decoder,
SetWindowLongPtr(m_hwnd, GWL_STYLE, WS_CHILDWINDOW | WS_CAPTION | WS_THICKFRAME | WS_MINIMIZE | WS_MAXIMIZE | WS_SYSMENU | WS_POPUP); SetWindowLongPtr(m_hwnd, GWL_STYLE, WS_CHILDWINDOW | WS_CAPTION | WS_THICKFRAME | WS_MINIMIZE | WS_MAXIMIZE | WS_SYSMENU | WS_POPUP);
SetWindowLongPtr(m_hwnd, GWL_EXSTYLE, WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | WS_EX_NOACTIVATE | WS_EX_TOPMOST | WS_EX_TRANSPARENT | WS_EX_TOOLWINDOW); SetWindowLongPtr(m_hwnd, GWL_EXSTYLE, WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | WS_EX_NOACTIVATE | WS_EX_TOPMOST | WS_EX_TRANSPARENT | WS_EX_TOOLWINDOW);
#endif
#ifdef Q_OS_MACOS
//debug
this->setWidth(screen->size().width());
this->setHeight(screen->size().height());
int x = screen->geometry().x();
int y = screen->geometry().y();
this->setX(screen->geometry().x());// + offsetX);
this->setY(screen->geometry().y());// + offsetY);#endif
#endif
Qt::WindowFlags flags = this->flags(); Qt::WindowFlags flags = this->flags();
this->setFlags(flags | Qt::FramelessWindowHint | Qt::WindowStaysOnBottomHint); this->setFlags(flags | Qt::FramelessWindowHint | Qt::WindowStaysOnBottomHint);
@ -136,7 +152,14 @@ MainWindow::MainWindow(int i, QString projectPath, QString id, QString decoder,
} }
}); });
setVisible(true);
#ifdef Q_OS_MACOS
MacIntegration* integration = new MacIntegration(this);
integration->SetBackgroundLevel(this);
#endif #endif
} }
void MainWindow::init() void MainWindow::init()
{ {