Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

PopupWindow: Fix showing custom scrollbars

Browse Source
This commit is contained in:
David Rosca 2017-01-22 14:43:22 +01:00
parent f6e9cc1c6a
commit 0cc9692f63
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/popupwindow/popupwebview.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* QupZilla - WebKit based browser * QupZilla - Qt web browser
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -38,7 +38,7 @@ PopupWebView::PopupWebView(QWidget* parent)
QWidget* PopupWebView::overlayWidget() QWidget* PopupWebView::overlayWidget()
{ {
return this; return parentWidget();
} }
void PopupWebView::loadInNewTab(const LoadRequest &req, Qz::NewTabPositionFlags position) void PopupWebView::loadInNewTab(const LoadRequest &req, Qz::NewTabPositionFlags position)

14
src/lib/popupwindow/popupwindow.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* QupZilla - WebKit based browser * QupZilla - Qt web browser
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -97,9 +97,17 @@ PopupWindow::PopupWindow(PopupWebView* view)
addAction(action); 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->insertWidget(0, m_menuBar);
m_layout->addWidget(m_locationBar); m_layout->addWidget(m_locationBar);
m_layout->addWidget(m_view); m_layout->addWidget(viewWidget);
m_layout->addWidget(m_statusBar); m_layout->addWidget(m_statusBar);
setLayout(m_layout); setLayout(m_layout);