TDE
/
qt3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/qt3
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3

Browse Source
pull/2/head
Darrell Anderson 12 years ago
parent 5b20d188ac 679d4f0bcd
commit 4cc563da10
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

14
src/kernel/qstyle.cpp
Unescape View File

@ -2422,7 +2422,7 @@ void QStyle::drawPrimitive( PrimitiveElement pe,
} }
} }
QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, QStyleOption()); QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt);
drawPrimitive(pe, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, QStyleOption()), r, cg, flags, opt); drawPrimitive(pe, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, QStyleOption()), r, cg, flags, opt);
} }
@ -2485,7 +2485,7 @@ void QStyle::drawComplexControl( ComplexControl control,
} }
#endif #endif
QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, QStyleOption()); QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt);
drawComplexControl(control, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, QStyleOption()), r, cg, flags, controls, active, opt, widget); drawComplexControl(control, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, QStyleOption()), r, cg, flags, controls, active, opt, widget);
} }
@ -2495,7 +2495,7 @@ void QStyle::drawComplexControlMask( ComplexControl control,
const QRect &r, const QRect &r,
const QStyleOption& opt ) const const QStyleOption& opt ) const
{ {
QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, QStyleOption()); QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt);
drawComplexControlMask(control, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, QStyleOption()), r, opt, widget); drawComplexControlMask(control, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, QStyleOption()), r, opt, widget);
} }
@ -2511,7 +2511,7 @@ QRect QStyle::querySubControlMetrics( ComplexControl control,
} }
#endif #endif
QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, QStyleOption(), false); QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt, false);
return querySubControlMetrics(control, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, QStyleOption()), sc, opt, widget); return querySubControlMetrics(control, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, QStyleOption()), sc, opt, widget);
} }
@ -2544,19 +2544,19 @@ QSize QStyle::sizeFromContents(ContentsType contents,
} }
#endif #endif
QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, QStyleOption()); QStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt);
return sizeFromContents(contents, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, QStyleOption()), contentsSize, opt, widget); return sizeFromContents(contents, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, QStyleOption()), contentsSize, opt, widget);
} }
int QStyle::styleHint(StyleHint sh, const QWidget * w, const QStyleOption &so, QStyleHintReturn *shr) const int QStyle::styleHint(StyleHint sh, const QWidget * w, const QStyleOption &so, QStyleHintReturn *shr) const
{ {
QStyleControlElementData ceData = populateControlElementDataFromWidget(w, QStyleOption(), false); QStyleControlElementData ceData = populateControlElementDataFromWidget(w, so, false);
return styleHint(sh, ceData, getControlElementFlagsForObject(w, ceData.widgetObjectTypes, QStyleOption(), false), so, shr, w); return styleHint(sh, ceData, getControlElementFlagsForObject(w, ceData.widgetObjectTypes, QStyleOption(), false), so, shr, w);
} }
QPixmap QStyle::stylePixmap(StylePixmap sp, const QWidget *w, const QStyleOption &so) const QPixmap QStyle::stylePixmap(StylePixmap sp, const QWidget *w, const QStyleOption &so) const
{ {
QStyleControlElementData ceData = populateControlElementDataFromWidget(w, QStyleOption()); QStyleControlElementData ceData = populateControlElementDataFromWidget(w, so);
return stylePixmap(sp, ceData, getControlElementFlagsForObject(w, ceData.widgetObjectTypes, QStyleOption()), so, w); return stylePixmap(sp, ceData, getControlElementFlagsForObject(w, ceData.widgetObjectTypes, QStyleOption()), so, w);
} }

Write Preview
Loading…
Cancel
Save