diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp index 227cceaed..031bee19f 100644 --- a/src/lib/app/browserwindow.cpp +++ b/src/lib/app/browserwindow.cpp @@ -432,13 +432,6 @@ void BrowserWindow::setupUi() #endif } - // 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); - restoreUiState(uiState); // Set some sane minimum width diff --git a/src/lib/app/proxystyle.cpp b/src/lib/app/proxystyle.cpp index b3aaa1f5c..46772d508 100644 --- a/src/lib/app/proxystyle.cpp +++ b/src/lib/app/proxystyle.cpp @@ -55,12 +55,7 @@ int ProxyStyle::pixelMetric(PixelMetric metric, const QStyleOption* option, cons case PM_TabBarTabHSpace: if (m_TabBarTabHSpace == -1) { m_TabBarTabHSpace = qMin(QProxyStyle::pixelMetric(PM_TabBarTabHSpace, option, widget), 14); - - if (name() == QLatin1String("oxygen")) { - m_TabBarTabHSpace = 14; - } } - return m_TabBarTabHSpace; default: diff --git a/src/lib/navigation/locationbar.cpp b/src/lib/navigation/locationbar.cpp index d08b94a02..42271c7e4 100644 --- a/src/lib/navigation/locationbar.cpp +++ b/src/lib/navigation/locationbar.cpp @@ -55,7 +55,7 @@ LocationBar::LocationBar(QWidget *parent) setObjectName("locationbar"); setDragEnabled(true); - // Disable Oxygen QLineEdit transitions, it breaks with setText() && home() + // Disable KDE QLineEdit transitions, it breaks with setText() && home() setProperty("_kde_no_animations", QVariant(true)); m_bookmarkIcon = new BookmarksIcon(this); diff --git a/src/lib/other/statusbar.cpp b/src/lib/other/statusbar.cpp index e8de12876..76f85806a 100644 --- a/src/lib/other/statusbar.cpp +++ b/src/lib/other/statusbar.cpp @@ -135,16 +135,6 @@ void TipLabel::hideDelayed() m_timer->start(); } -void TipLabel::resizeEvent(QResizeEvent* ev) -{ - SqueezeLabelV1::resizeEvent(ev); - - // Oxygen is setting rounded corners only for top-level tooltips - if (mApp->styleName() == QLatin1String("oxygen")) { - setMask(QzTools::roundedRect(rect(), 4)); - } -} - void TipLabel::paintEvent(QPaintEvent* ev) { QStylePainter p(this); diff --git a/src/lib/other/statusbar.h b/src/lib/other/statusbar.h index 0cb897b60..6b0bf5077 100644 --- a/src/lib/other/statusbar.h +++ b/src/lib/other/statusbar.h @@ -39,7 +39,6 @@ public: bool eventFilter(QObject* o, QEvent* e); private: - void resizeEvent(QResizeEvent* ev); void paintEvent(QPaintEvent* ev); QTimer* m_timer; diff --git a/src/lib/tabwidget/combotabbar.cpp b/src/lib/tabwidget/combotabbar.cpp index 5bce9f321..6d11f812b 100644 --- a/src/lib/tabwidget/combotabbar.cpp +++ b/src/lib/tabwidget/combotabbar.cpp @@ -531,12 +531,6 @@ void ComboTabBar::setUpLayout() height = qMax(m_mainTabBar->sizeHint().height(), m_pinnedTabBar->sizeHint().height()); } - // Workaround for Oxygen theme. For some reason, QTabBar::height() returns bigger - // height than it actually should. - if (mApp->styleName() == QLatin1String("oxygen")) { - height -= 4; - } - // We need to setup heights even before m_mainTabBar->height() has correct value // So lets just set minimum 5px height height = qMax(5, height);