mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 10:46:35 +01:00
PopupWindow: Fix showing custom scrollbars
This commit is contained in:
parent
f6e9cc1c6a
commit
0cc9692f63
@ -1,6 +1,6 @@
|
||||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com>
|
||||
* QupZilla - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -38,7 +38,7 @@ PopupWebView::PopupWebView(QWidget* parent)
|
||||
|
||||
QWidget* PopupWebView::overlayWidget()
|
||||
{
|
||||
return this;
|
||||
return parentWidget();
|
||||
}
|
||||
|
||||
void PopupWebView::loadInNewTab(const LoadRequest &req, Qz::NewTabPositionFlags position)
|
||||
|
@ -1,6 +1,6 @@
|
||||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com>
|
||||
* QupZilla - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -97,9 +97,17 @@ PopupWindow::PopupWindow(PopupWebView* view)
|
||||
addAction(action);
|
||||
}
|
||||
|
||||
QVBoxLayout *l = new QVBoxLayout();
|
||||
l->setContentsMargins(0, 0, 0, 0);
|
||||
l->setSpacing(0);
|
||||
l->addWidget(m_view);
|
||||
|
||||
QWidget *viewWidget = new QWidget(this);
|
||||
viewWidget->setLayout(l);
|
||||
|
||||
m_layout->insertWidget(0, m_menuBar);
|
||||
m_layout->addWidget(m_locationBar);
|
||||
m_layout->addWidget(m_view);
|
||||
m_layout->addWidget(viewWidget);
|
||||
m_layout->addWidget(m_statusBar);
|
||||
setLayout(m_layout);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user