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

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

Browse Source
pull/1/head
Darrell Anderson 12 years ago
parent aefb900336 7527f04a05
commit b819aed7f2
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 TQStyle::drawPrimitive( PrimitiveElement pe,
} }
} }
TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, TQStyleOption()); TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt);
drawPrimitive(pe, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), r, cg, flags, opt); drawPrimitive(pe, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), r, cg, flags, opt);
} }
@ -2485,7 +2485,7 @@ void TQStyle::drawComplexControl( ComplexControl control,
} }
#endif #endif
TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, TQStyleOption()); TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt);
drawComplexControl(control, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), r, cg, flags, controls, active, opt, widget); drawComplexControl(control, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), r, cg, flags, controls, active, opt, widget);
} }
@ -2495,7 +2495,7 @@ void TQStyle::drawComplexControlMask( ComplexControl control,
const TQRect &r, const TQRect &r,
const TQStyleOption& opt ) const const TQStyleOption& opt ) const
{ {
TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, TQStyleOption()); TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt);
drawComplexControlMask(control, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), r, opt, widget); drawComplexControlMask(control, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), r, opt, widget);
} }
@ -2511,7 +2511,7 @@ TQRect TQStyle::querySubControlMetrics( ComplexControl control,
} }
#endif #endif
TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, TQStyleOption(), false); TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt, false);
return querySubControlMetrics(control, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), sc, opt, widget); return querySubControlMetrics(control, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), sc, opt, widget);
} }
@ -2544,19 +2544,19 @@ TQSize TQStyle::sizeFromContents(ContentsType contents,
} }
#endif #endif
TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, TQStyleOption()); TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt);
return sizeFromContents(contents, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), contentsSize, opt, widget); return sizeFromContents(contents, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), contentsSize, opt, widget);
} }
int TQStyle::styleHint(StyleHint sh, const TQWidget * w, const TQStyleOption &so, TQStyleHintReturn *shr) const int TQStyle::styleHint(StyleHint sh, const TQWidget * w, const TQStyleOption &so, TQStyleHintReturn *shr) const
{ {
TQStyleControlElementData ceData = populateControlElementDataFromWidget(w, TQStyleOption(), false); TQStyleControlElementData ceData = populateControlElementDataFromWidget(w, so, false);
return styleHint(sh, ceData, getControlElementFlagsForObject(w, ceData.widgetObjectTypes, TQStyleOption(), false), so, shr, w); return styleHint(sh, ceData, getControlElementFlagsForObject(w, ceData.widgetObjectTypes, TQStyleOption(), false), so, shr, w);
} }
TQPixmap TQStyle::stylePixmap(StylePixmap sp, const TQWidget *w, const TQStyleOption &so) const TQPixmap TQStyle::stylePixmap(StylePixmap sp, const TQWidget *w, const TQStyleOption &so) const
{ {
TQStyleControlElementData ceData = populateControlElementDataFromWidget(w, TQStyleOption()); TQStyleControlElementData ceData = populateControlElementDataFromWidget(w, so);
return stylePixmap(sp, ceData, getControlElementFlagsForObject(w, ceData.widgetObjectTypes, TQStyleOption()), so, w); return stylePixmap(sp, ceData, getControlElementFlagsForObject(w, ceData.widgetObjectTypes, TQStyleOption()), so, w);
} }

Write Preview
Loading…
Cancel
Save