mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-19 18:26:34 +01:00
[Oxygen] Workaround for transparent background of tooltips.
Closes #865
This commit is contained in:
parent
4d01cfc9fa
commit
53890c9f0e
@ -9,6 +9,7 @@ Version 1.5.0
|
|||||||
* cancel upload when trying to upload non-readable files
|
* cancel upload when trying to upload non-readable files
|
||||||
* GreaseMonkey: added support for GM_Settings
|
* GreaseMonkey: added support for GM_Settings
|
||||||
* oxygen: set rounded corners for tooltips
|
* oxygen: set rounded corners for tooltips
|
||||||
|
* oxygen: workaround for transparent background of tooltips
|
||||||
* fixed: size of preferences dialog on low-res screens
|
* fixed: size of preferences dialog on low-res screens
|
||||||
* fixed: loading plugins with relative paths in portable build
|
* fixed: loading plugins with relative paths in portable build
|
||||||
|
|
||||||
|
@ -85,6 +85,7 @@
|
|||||||
#include <QWebHistory>
|
#include <QWebHistory>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QDesktopWidget>
|
#include <QDesktopWidget>
|
||||||
|
#include <QToolTip>
|
||||||
|
|
||||||
#if QT_VERSION < 0x050000
|
#if QT_VERSION < 0x050000
|
||||||
#include "qwebkitversion.h"
|
#include "qwebkitversion.h"
|
||||||
@ -343,6 +344,13 @@ void QupZilla::setupUi()
|
|||||||
statusBar()->insertPermanentWidget(1, m_ipLabel);
|
statusBar()->insertPermanentWidget(1, m_ipLabel);
|
||||||
statusBar()->insertPermanentWidget(2, m_privateBrowsing);
|
statusBar()->insertPermanentWidget(2, m_privateBrowsing);
|
||||||
statusBar()->insertPermanentWidget(3, m_adblockIcon);
|
statusBar()->insertPermanentWidget(3, m_adblockIcon);
|
||||||
|
|
||||||
|
// Workaround for Oxygen tooltips not having transparent background
|
||||||
|
QPalette pal = QToolTip::palette();
|
||||||
|
QColor col = pal.window().color();
|
||||||
|
col.setAlpha(0);
|
||||||
|
pal.setColor(QPalette::Window, col);
|
||||||
|
QToolTip::setPalette(pal);
|
||||||
}
|
}
|
||||||
|
|
||||||
void QupZilla::setupMenu()
|
void QupZilla::setupMenu()
|
||||||
@ -802,7 +810,7 @@ void QupZilla::loadSettings()
|
|||||||
|
|
||||||
m_sideBarManager->showSideBar(activeSideBar, false);
|
m_sideBarManager->showSideBar(activeSideBar, false);
|
||||||
|
|
||||||
//Private browsing
|
// Private browsing
|
||||||
m_privateBrowsing->setVisible(mApp->isPrivateSession());
|
m_privateBrowsing->setVisible(mApp->isPrivateSession());
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
@ -817,7 +825,8 @@ void QupZilla::loadSettings()
|
|||||||
if (!makeTransparent) {
|
if (!makeTransparent) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//Opacity
|
|
||||||
|
// Transparency on X11 (no blur like on Windows)
|
||||||
#ifdef QZ_WS_X11
|
#ifdef QZ_WS_X11
|
||||||
setAttribute(Qt::WA_TranslucentBackground);
|
setAttribute(Qt::WA_TranslucentBackground);
|
||||||
setAttribute(Qt::WA_NoSystemBackground, false);
|
setAttribute(Qt::WA_NoSystemBackground, false);
|
||||||
|
Loading…
Reference in New Issue
Block a user