chatterino2
Code Issues

added some more race conditions to the browser extension

Browse Source
This commit is contained in:
fourtf
2018-05-29 23:58:11 +02:00
parent 6d4344e66c
commit e01a3a0978
4 changed files with 117 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/singletons/nativemessagingmanager.cpp
+5 -3
View File
@@ -172,9 +172,11 @@ void NativeMessagingManager::ReceiverThread::handleMessage(const QJsonObject &ro
if (attach) {
#ifdef USEWINSDK
auto *window = widgets::AttachedWindow::get(::GetForegroundWindow(), args);
if (!name.isEmpty()) {
window->setChannel(app->twitch.server->getOrAddChannel(name));
if (args.height != -1) {
auto *window = widgets::AttachedWindow::get(::GetForegroundWindow(), args);
if (!name.isEmpty()) {
window->setChannel(app->twitch.server->getOrAddChannel(name));
}
}
// window->show();
#endif
src/widgets/attachedwindow.cpp
+4 -3
View File
@@ -80,7 +80,7 @@ AttachedWindow *AttachedWindow::get(void *target, const GetArgs &args)
if (show) {
window->show();
window->resize(size);
// window->resize(size);
}
return window;
@@ -156,8 +156,9 @@ void AttachedWindow::attachToHwnd(void *_hwnd)
SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
if (this->_height == -1) {
::MoveWindow(hwnd, rect.right - this->_width - 8, rect.top + this->yOffset - 8,
this->_width, rect.bottom - rect.top - this->yOffset, false);
// ::MoveWindow(hwnd, rect.right - this->_width - 8, rect.top + this->yOffset
// - 8,
// this->_width, rect.bottom - rect.top - this->yOffset, false);
} else {
::MoveWindow(hwnd, rect.right - this->_width - 8, rect.bottom - this->_height - 8,
this->_width, this->_height, false);