AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QCommonStyle: make sure to pass the widget to pixelMetric()

Browse Source 
QStyle::pixelMetric() expects the affected QWidget as third parameter.
Some (external) styles rely on this to return the correct value.
Therefore add the widget to the function calls where possible.

Fixes: QTBUG-80971
Task-number: QTBUG-1857
Change-Id: I768ebb61a914cdba6e0549f841d46cf3edb0a2a6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Christian Ehrlicher 2019-12-27 12:49:44 +01:00
parent 6e3b4ddd92
commit 411c2e3e4f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/widgets/styles/qcommonstyle.cpp
View File

@ -4569,7 +4569,7 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
case PM_MenuPanelWidth: case PM_MenuPanelWidth:
case PM_TabBarBaseOverlap: case PM_TabBarBaseOverlap:
case PM_TabBarBaseHeight: case PM_TabBarBaseHeight:
ret = proxy()->pixelMetric(PM_DefaultFrameWidth, opt); ret = proxy()->pixelMetric(PM_DefaultFrameWidth, opt, widget);
break; break;
case PM_MdiSubWindowFrameWidth: case PM_MdiSubWindowFrameWidth:
@ -4801,7 +4801,7 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
break; break;
case PM_TabBarIconSize: case PM_TabBarIconSize:
ret = proxy()->pixelMetric(PM_SmallIconSize, opt); ret = proxy()->pixelMetric(PM_SmallIconSize, opt, widget);
break; break;
case PM_ListViewIconSize: case PM_ListViewIconSize:
#if QT_CONFIG(filedialog) #if QT_CONFIG(filedialog)
@ -4809,7 +4809,7 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
ret = int(QStyleHelper::dpiScaled(24., opt)); ret = int(QStyleHelper::dpiScaled(24., opt));
else else
#endif #endif
ret = proxy()->pixelMetric(PM_SmallIconSize, opt); ret = proxy()->pixelMetric(PM_SmallIconSize, opt, widget);
break; break;
case PM_ButtonIconSize: case PM_ButtonIconSize:
@ -4817,7 +4817,7 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
ret = int(QStyleHelper::dpiScaled(16, opt)); ret = int(QStyleHelper::dpiScaled(16, opt));
break; break;
case PM_IconViewIconSize: case PM_IconViewIconSize:
ret = proxy()->pixelMetric(PM_LargeIconSize, opt); ret = proxy()->pixelMetric(PM_LargeIconSize, opt, widget);
break; break;
case PM_LargeIconSize: case PM_LargeIconSize:
@ -4855,13 +4855,13 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
ret = int(QStyleHelper::dpiScaled(16, opt)); ret = int(QStyleHelper::dpiScaled(16, opt));
break; break;
case PM_ScrollView_ScrollBarSpacing: case PM_ScrollView_ScrollBarSpacing:
ret = 2 * proxy()->pixelMetric(PM_DefaultFrameWidth, opt); ret = 2 * proxy()->pixelMetric(PM_DefaultFrameWidth, opt, widget);
break; break;
case PM_ScrollView_ScrollBarOverlap: case PM_ScrollView_ScrollBarOverlap:
ret = 0; ret = 0;
break; break;
case PM_SubMenuOverlap: case PM_SubMenuOverlap:
ret = -proxy()->pixelMetric(QStyle::PM_MenuPanelWidth, opt); ret = -proxy()->pixelMetric(QStyle::PM_MenuPanelWidth, opt, widget);
break; break;
case PM_TreeViewIndentation: case PM_TreeViewIndentation:
ret = int(QStyleHelper::dpiScaled(20, opt)); ret = int(QStyleHelper::dpiScaled(20, opt));