Update kstyle API

pull/16/head
Timothy Pearson 12 years ago
parent 0ee242623b
commit bf9b9d6bd9

@ -98,7 +98,7 @@ public:
int pixelMetric(PixelMetric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget * = 0) const;
int kPixelMetric( KStylePixelMetric kpm, const TQWidget* /* widget */) const;
int kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) const;
TQRect subRect(SubRect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *) const;

@ -1437,7 +1437,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
}
// Draw all the branches...
static int thickness = kPixelMetric( KPM_ListViewBranchThickness );
static int thickness = kPixelMetric( KPM_ListViewBranchThickness, ceData, elementFlags );
int line; // index into dotlines
TQRect branchrect;
TQStyle::StyleFlags branchflags;
@ -1678,7 +1678,7 @@ int HighContrastStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceDa
}
}
int HighContrastStyle::kPixelMetric( KStylePixelMetric kpm, const TQWidget *widget ) const
int HighContrastStyle::kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
{
switch (kpm) {
case KPM_ListViewBranchThickness:
@ -1686,7 +1686,7 @@ int HighContrastStyle::kPixelMetric( KStylePixelMetric kpm, const TQWidget *widg
// the drawKStylePrimitive KPE_ListViewBranch case.
return basicLineWidth;
default:
return KStyle::kPixelMetric(kpm, widget);
return KStyle::kPixelMetric(kpm, ceData, elementFlags, widget);
}
}

@ -137,7 +137,7 @@ class HighContrastStyle : public KStyle
int pixelMetric( PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags,
const TQWidget *widget = 0 ) const;
int kPixelMetric( KStylePixelMetric m,
int kPixelMetric( KStylePixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags,
const TQWidget *widget = 0 ) const;
TQSize sizeFromContents( ContentsType contents,

@ -541,7 +541,7 @@ void KStyle::drawKStylePrimitive( KStylePrimitive kpe,
}
int KStyle::kPixelMetric( KStylePixelMetric kpm, const TQWidget* /* widget */) const
int KStyle::kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) const
{
int value;
switch(kpm)
@ -1389,7 +1389,7 @@ void KStyle::drawComplexControl( TQ_ComplexControl control,
}
// Draw all the branches...
static int thickness = kPixelMetric( KPM_ListViewBranchThickness );
static int thickness = kPixelMetric( KPM_ListViewBranchThickness, ceData, elementFlags );
int line; // index into dotlines
TQRect branchrect;
TQStyle::StyleFlags branchflags;

@ -282,7 +282,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
KPM_ListViewBranchThickness = 0x00000100
};
int kPixelMetric( KStylePixelMetric kpm, const TQWidget* widget = 0 ) const;
int kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget* widget = 0 ) const;
// ---------------------------------------------------------------------------

Loading…
Cancel
Save