From 786373a1cb683893140345ec10b222bef9055c35 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 14 Aug 2023 19:54:31 +0300 Subject: [PATCH] kstyles: remove check for non-existing QWebView class Signed-off-by: Ivailo Monev --- kstyles/oxygen/oxygenstyle.cpp | 13 +------------ kstyles/oxygen/oxygenstyle.h | 1 - 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/kstyles/oxygen/oxygenstyle.cpp b/kstyles/oxygen/oxygenstyle.cpp index c35b8b5f..893dc788 100644 --- a/kstyles/oxygen/oxygenstyle.cpp +++ b/kstyles/oxygen/oxygenstyle.cpp @@ -955,6 +955,7 @@ namespace Oxygen // register primitives for which nothing is done case PE_FrameStatusBar: fcn = &Style::emptyPrimitive; break; + case PE_PanelScrollAreaCorner: fcn = &Style::emptyPrimitive; break; case PE_Frame: fcn = &Style::drawFramePrimitive; break; @@ -986,7 +987,6 @@ namespace Oxygen case PE_PanelItemViewItem: fcn = &Style::drawPanelItemViewItemPrimitive; break; case PE_PanelLineEdit: fcn = &Style::drawPanelLineEditPrimitive; break; case PE_PanelMenu: fcn = &Style::drawPanelMenuPrimitive; break; - case PE_PanelScrollAreaCorner: fcn = &Style::drawPanelScrollAreaCornerPrimitive; break; case PE_PanelTipLabel: fcn = &Style::drawPanelTipLabelPrimitive; break; case PE_IndicatorMenuCheckMark: fcn = &Style::drawIndicatorMenuCheckMarkPrimitive; break; @@ -3252,17 +3252,6 @@ namespace Oxygen } - //___________________________________________________________________________________ - bool Style::drawPanelScrollAreaCornerPrimitive( const QStyleOption*, QPainter*, const QWidget* widget ) const - { - // disable painting of PE_PanelScrollAreaCorner - // the default implementation fills the rect with the window background color - // which does not work for windows that have gradients. - // unfortunately, this does not work when scrollbars are children of QWebView, - // in which case, false is returned, in order to fall back to the parent style implementation - return !( widget && widget->inherits( "QWebView" ) ); - } - //___________________________________________________________________________________ bool Style::drawPanelTipLabelPrimitive( const QStyleOption* option, QPainter* painter, const QWidget* widget ) const { diff --git a/kstyles/oxygen/oxygenstyle.h b/kstyles/oxygen/oxygenstyle.h index b4be69a1..04ae25db 100644 --- a/kstyles/oxygen/oxygenstyle.h +++ b/kstyles/oxygen/oxygenstyle.h @@ -486,7 +486,6 @@ namespace Oxygen bool drawPanelButtonCommandPrimitive( const QStyleOption*, QPainter*, const QWidget* ) const; bool drawPanelMenuPrimitive( const QStyleOption*, QPainter*, const QWidget* ) const; bool drawPanelButtonToolPrimitive( const QStyleOption*, QPainter*, const QWidget* ) const; - bool drawPanelScrollAreaCornerPrimitive( const QStyleOption*, QPainter*, const QWidget* ) const; bool drawPanelTipLabelPrimitive( const QStyleOption*, QPainter*, const QWidget* ) const; bool drawPanelItemViewItemPrimitive( const QStyleOption*, QPainter*, const QWidget* ) const; bool drawPanelLineEditPrimitive( const QStyleOption*, QPainter*, const QWidget* ) const;