hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

X11Embed: Remove flag causing embedding to fail

Browse Source
This commit is contained in:
Lukas W
2017-04-08 23:14:23 +02:00
parent f097be6c40
commit 0e311ffd47
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/vst_base/VstPlugin.cpp
View File

@@ -229,7 +229,9 @@ void VstPlugin::showEditor( QWidget * _parent, bool isEffect )
return;
}
QX11EmbedContainer * xe = new QX11EmbedContainer;
vstSubWin * sw = new vstSubWin( gui->mainWindow()->workspace() );
QX11EmbedContainer * xe = new QX11EmbedContainer(sw);
m_pluginWidget = xe;
m_pluginWidget->setFixedSize( m_pluginGeometry );
m_pluginWidget->setWindowTitle( name() );
@@ -238,8 +240,6 @@ void VstPlugin::showEditor( QWidget * _parent, bool isEffect )
if( _parent == NULL )
{
vstSubWin * sw = new vstSubWin(
gui->mainWindow()->workspace() );
sw->setWidget( m_pluginWidget );
if( isEffect )

4
src/gui/X11EmbedContainer.cpp
View File

@@ -356,8 +356,8 @@ QX11EmbedContainer::QX11EmbedContainer(QWidget *parent)
Q_D(QX11EmbedContainer);
//XSetErrorHandler(x11ErrorHandler);
//setAttribute(Qt::WA_DontCreateNativeAncestors);
setAttribute(Qt::WA_NativeWindow);
setAttribute(Qt::WA_DontCreateNativeAncestors);
createWinId();
setFocusPolicy(Qt::StrongFocus);
@@ -369,8 +369,8 @@ QX11EmbedContainer::QX11EmbedContainer(QWidget *parent)
// Everybody gets a focus proxy, but only one toplevel container's
// focus proxy is actually in use.
d->focusProxy = new QWidget(this);
//d->focusProxy->setAttribute(Qt::WA_DontCreateNativeAncestors);
d->focusProxy->setAttribute(Qt::WA_NativeWindow);
d->focusProxy->setAttribute(Qt::WA_DontCreateNativeAncestors);
d->focusProxy->createWinId();
d->focusProxy->winId();
d->focusProxy->setGeometry(-1, -1, 1, 1);