Commit 7a5e4793 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Fix mixup of PM_ToolBarItemMargin & PM_ToolBarFrameWidth

While Oxygen draws no frames around toolbars, yet it had the style hint
for the frame width set to 2, while having the actual toolbar margin
set to 0.

The possible cause is that PM_ToolBarItemMargin was only introduced for
Qt4, so seemingly Qt3 times' workaround to set the margin via the frame
width missed to be adapted.

Qt's own codee uses PM_ToolBarItemMargin & PM_ToolBarFrameWidth to
calculate the QToolbar layout's contentmargin, so switching the values
results in no actual change there.
The only other use is PM_ToolBarFrameWidth for initializing the
QStyleOptionToolBar::lineWidth, which though is unused by Oxygen drawing
code, so the change also has no effect.

But 3rd-party code querying the pixel metric for these two values after
this patch gets proper values and can properly align custom UI painting with the
styled toolbar.

(cherry picked from commit 70994586)
parent 7c451672
Pipeline #184238 passed with stage
in 1 minute and 39 seconds
......@@ -79,11 +79,12 @@ namespace Oxygen
ScrollBar_MinSliderHeight = 21,
// toolbars
ToolBar_FrameWidth = 2,
ToolBar_FrameWidth = 0,
ToolBar_HandleExtent = 10,
ToolBar_HandleWidth = 6,
ToolBar_SeparatorWidth = 8,
ToolBar_ExtensionWidth = 20,
ToolBar_MarginSpacing = 2,
ToolBar_ItemSpacing = 0,
// progressbars
......
......@@ -699,7 +699,7 @@ namespace Oxygen
case PM_ToolBarExtensionExtent:
return pixelMetric( PM_SmallIconSize, option, widget ) + 2*Metrics::ToolButton_MarginWidth;
case PM_ToolBarItemMargin: return 0;
case PM_ToolBarItemMargin: return Metrics::ToolBar_MarginSpacing;
case PM_ToolBarItemSpacing: return Metrics::ToolBar_ItemSpacing;
// tabbars
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment