Commit 0f2e5ad4 authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧
Browse files

MainWindow: Remove workarounds for QX11EmbedContainer

QX11EmbedContainer is not around anymore and this breaks on Wayland.

BUG: 436650
parent 0c820339
Pipeline #210259 passed with stage
in 1 minute and 58 seconds
......@@ -295,7 +295,6 @@ void MainWindow::newConnection(const QUrl &newUrl, bool switchFullscreenWhenConn
connect(view, SIGNAL(statusChanged(RemoteView::RemoteStatus)), this, SLOT(statusChanged(RemoteView::RemoteStatus)));
connect(view, SIGNAL(disconnected()), this, SLOT(disconnectHost()));
view->winId(); // native widget workaround for bug 253365
QScrollArea *scrollArea = createScrollArea(m_tabWidget, view);
const int indexOfNewConnectionWidget = m_tabWidget->indexOf(m_newConnectionWidget);
......@@ -512,7 +511,6 @@ void MainWindow::switchFullscreen()
KToggleFullScreenAction::setFullScreen(m_fullscreenWindow, true);
MinimizePixel *minimizePixel = new MinimizePixel(m_fullscreenWindow);
minimizePixel->winId(); // force it to be a native widget (prevents problem with QX11EmbedContainer)
connect(minimizePixel, SIGNAL(rightClicked()), m_fullscreenWindow, SLOT(showMinimized()));
m_fullscreenWindow->installEventFilter(this);
......@@ -811,7 +809,6 @@ void MainWindow::showRemoteViewToolbar()
if (!m_toolBar) {
m_toolBar = new FloatingToolBar(m_fullscreenWindow, m_fullscreenWindow);
m_toolBar->winId(); // force it to be a native widget (prevents problem with QX11EmbedContainer)
m_toolBar->setSide(FloatingToolBar::Top);
KComboBox *sessionComboBox = new KComboBox(m_toolBar);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment