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

Automated update from Qt3

Browse Source
pull/1/head
Timothy Pearson 10 years ago
parent 6fb1d18ed1
commit e45396f47a
5 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File

16
examples/themes/metal.cpp
Unescape View File

@ -41,7 +41,7 @@ MetalStyle::MetalStyle() : TQWindowsStyle() { }
/*! /*!
Reimplementation from TQStyle Reimplementation from TQStyle
*/ */
void MetalStyle::applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) void MetalStyle::applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
oldPalette = ceData.palette; oldPalette = ceData.palette;
@ -99,7 +99,7 @@ void MetalStyle::applicationPolish( TQStyleControlElementData ceData, ControlEle
/*! /*!
Reimplementation from TQStyle Reimplementation from TQStyle
*/ */
void MetalStyle::applicationUnPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) void MetalStyle::applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
applicationActionRequest(ceData, elementFlags, ptr, AAR_SetPalette, TQStyleApplicationActionRequestData(oldPalette, TRUE)); applicationActionRequest(ceData, elementFlags, ptr, AAR_SetPalette, TQStyleApplicationActionRequestData(oldPalette, TRUE));
applicationActionRequest(ceData, elementFlags, ptr, AAR_SetFont, TQStyleApplicationActionRequestData(ceData.font, TRUE)); applicationActionRequest(ceData, elementFlags, ptr, AAR_SetFont, TQStyleApplicationActionRequestData(ceData.font, TRUE));
@ -108,7 +108,7 @@ void MetalStyle::applicationUnPolish( TQStyleControlElementData ceData, ControlE
/*! /*!
Reimplementation from TQStyle Reimplementation from TQStyle
*/ */
void MetalStyle::polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) void MetalStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
// the polish function sets some widgets to transparent mode and // the polish function sets some widgets to transparent mode and
// some to translate background mode in order to get the full // some to translate background mode in order to get the full
@ -126,7 +126,7 @@ void MetalStyle::polish( TQStyleControlElementData ceData, ControlElementFlags e
} }
} }
void MetalStyle::unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) void MetalStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
// the polish function sets some widgets to transparent mode and // the polish function sets some widgets to transparent mode and
// some to translate background mode in order to get the full // some to translate background mode in order to get the full
@ -145,7 +145,7 @@ void MetalStyle::unPolish( TQStyleControlElementData ceData, ControlElementFlags
void MetalStyle::drawPrimitive( PrimitiveElement pe, void MetalStyle::drawPrimitive( PrimitiveElement pe,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -191,7 +191,7 @@ void MetalStyle::drawPrimitive( PrimitiveElement pe,
void MetalStyle::drawControl( ControlElement element, void MetalStyle::drawControl( ControlElement element,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -292,7 +292,7 @@ void MetalStyle::drawControl( ControlElement element,
} }
void MetalStyle::drawComplexControl( ComplexControl cc, void MetalStyle::drawComplexControl( ComplexControl cc,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -468,7 +468,7 @@ void MetalStyle::drawMetalGradient( TQPainter *p, int x, int y, int w, int h,
int MetalStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *w ) const int MetalStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *w ) const
{ {
switch ( metric ) { switch ( metric ) {
case PM_MenuBarFrameWidth: case PM_MenuBarFrameWidth:

16
examples/themes/metal.h
Unescape View File

@ -26,14 +26,14 @@ class MetalStyle : public TQWindowsStyle
{ {
public: public:
MetalStyle(); MetalStyle();
void applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void applicationUnPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void drawPrimitive( PrimitiveElement pe, void drawPrimitive( PrimitiveElement pe,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -42,7 +42,7 @@ public:
void drawControl( ControlElement element, void drawControl( ControlElement element,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -52,7 +52,7 @@ public:
void drawComplexControl( ComplexControl cc, void drawComplexControl( ComplexControl cc,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -61,7 +61,7 @@ public:
SCFlags subActive = SC_None, SCFlags subActive = SC_None,
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
int pixelMetric( PixelMetric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const; int pixelMetric( PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const;
private: private:

22
examples/themes/wood.cpp
Unescape View File

@ -769,7 +769,7 @@ NorwegianWoodStyle::NorwegianWoodStyle() : TQWindowsStyle()
/*! /*!
Reimplementation from TQStyle Reimplementation from TQStyle
*/ */
void NorwegianWoodStyle::applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) void NorwegianWoodStyle::applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
oldPalette = ceData.palette; oldPalette = ceData.palette;
@ -871,7 +871,7 @@ void NorwegianWoodStyle::applicationPolish( TQStyleControlElementData ceData, Co
applicationActionRequest(ceData, elementFlags, ptr, AAR_SetPalette, TQStyleApplicationActionRequestData(TQPalette(active, disabled, active), TRUE)); applicationActionRequest(ceData, elementFlags, ptr, AAR_SetPalette, TQStyleApplicationActionRequestData(TQPalette(active, disabled, active), TRUE));
} }
void NorwegianWoodStyle::applicationUnPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) void NorwegianWoodStyle::applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
applicationActionRequest(ceData, elementFlags, ptr, AAR_SetPalette, TQStyleApplicationActionRequestData(oldPalette, TRUE)); applicationActionRequest(ceData, elementFlags, ptr, AAR_SetPalette, TQStyleApplicationActionRequestData(oldPalette, TRUE));
} }
@ -879,7 +879,7 @@ void NorwegianWoodStyle::applicationUnPolish( TQStyleControlElementData ceData,
/*! /*!
Reimplementation from TQStyle Reimplementation from TQStyle
*/ */
void NorwegianWoodStyle::polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) void NorwegianWoodStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
// the polish function sets some widgets to transparent mode and // the polish function sets some widgets to transparent mode and
// some to translate background mode in order to get the full // some to translate background mode in order to get the full
@ -896,7 +896,7 @@ void NorwegianWoodStyle::polish( TQStyleControlElementData ceData, ControlElemen
} }
} }
void NorwegianWoodStyle::unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) void NorwegianWoodStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
// the polish function sets some widgets to transparent mode and // the polish function sets some widgets to transparent mode and
// some to translate background mode in order to get the full // some to translate background mode in order to get the full
@ -915,7 +915,7 @@ void NorwegianWoodStyle::unPolish( TQStyleControlElementData ceData, ControlElem
void NorwegianWoodStyle::drawPrimitive( PrimitiveElement pe, void NorwegianWoodStyle::drawPrimitive( PrimitiveElement pe,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -986,7 +986,7 @@ void NorwegianWoodStyle::drawPrimitive( PrimitiveElement pe,
void NorwegianWoodStyle::drawControl( ControlElement element, void NorwegianWoodStyle::drawControl( ControlElement element,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -1095,7 +1095,7 @@ void NorwegianWoodStyle::drawControl( ControlElement element,
void NorwegianWoodStyle::drawControlMask( ControlElement element, void NorwegianWoodStyle::drawControlMask( ControlElement element,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQStyleOption& opt, const TQStyleOption& opt,
@ -1118,7 +1118,7 @@ void NorwegianWoodStyle::drawControlMask( ControlElement element,
void NorwegianWoodStyle::drawComplexControl( ComplexControl cc, void NorwegianWoodStyle::drawComplexControl( ComplexControl cc,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -1192,7 +1192,7 @@ void NorwegianWoodStyle::drawComplexControlMask( ComplexControl control,
} }
TQRect NorwegianWoodStyle::querySubControlMetrics( ComplexControl control, TQRect NorwegianWoodStyle::querySubControlMetrics( ComplexControl control,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sc, SubControl sc,
const TQStyleOption& opt, const TQStyleOption& opt,
@ -1250,7 +1250,7 @@ TQRect NorwegianWoodStyle::querySubControlMetrics( ComplexControl control,
return rect; return rect;
} }
TQRect NorwegianWoodStyle::subRect( SubRect sr, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget * widget ) const TQRect NorwegianWoodStyle::subRect( SubRect sr, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget * widget ) const
{ {
TQRect r; TQRect r;
switch ( sr ) { switch ( sr ) {
@ -1355,7 +1355,7 @@ static void get_combo_parameters( const TQRect &r,
static inline int buttonthickness( int d ) static inline int buttonthickness( int d )
{ return d > 20 ? 5 : ( d < 10 ? 2: 3 ); } { return d > 20 ? 5 : ( d < 10 ? 2: 3 ); }
void NorwegianWoodStyle::drawSemicircleButton( TQPainter *p, TQStyleControlElementData ceData, void NorwegianWoodStyle::drawSemicircleButton( TQPainter *p, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, const TQRect &r, ControlElementFlags elementFlags, const TQRect &r,
int dir, bool sunken, int dir, bool sunken,
const TQColorGroup &g ) const const TQColorGroup &g ) const

22
examples/themes/wood.h
Unescape View File

@ -26,14 +26,14 @@ class NorwegianWoodStyle : public TQWindowsStyle
{ {
public: public:
NorwegianWoodStyle(); NorwegianWoodStyle();
void applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void applicationUnPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void drawPrimitive( PrimitiveElement pe, void drawPrimitive( PrimitiveElement pe,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -42,7 +42,7 @@ public:
void drawControl( ControlElement element, void drawControl( ControlElement element,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -52,7 +52,7 @@ public:
void drawControlMask( ControlElement element, void drawControlMask( ControlElement element,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
@ -60,7 +60,7 @@ public:
void drawComplexControl( ComplexControl cc, void drawComplexControl( ComplexControl cc,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -79,17 +79,17 @@ public:
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
TQRect querySubControlMetrics( ComplexControl control, TQRect querySubControlMetrics( ComplexControl control,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sc, SubControl sc,
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
TQRect subRect( SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const; TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const;
private: private:
void drawSemicircleButton(TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, int dir, void drawSemicircleButton(TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, int dir,
bool sunken, const TQColorGroup &g ) const; bool sunken, const TQColorGroup &g ) const;
TQPalette oldPalette; TQPalette oldPalette;
TQPixmap *sunkenDark; TQPixmap *sunkenDark;

21
src/kernel/qstyle.cpp
Unescape View File

@ -2355,12 +2355,21 @@ bool TQStyle::eventFilter(TQObject *o, TQEvent *e) {
ControlElementFlags elementFlags = m_objectEventSourceFlagsToHandlerMap[o]; ControlElementFlags elementFlags = m_objectEventSourceFlagsToHandlerMap[o];
bool ret; bool ret;
TQWidget* w = dynamic_cast<TQWidget*>(o); TQWidget* w = dynamic_cast<TQWidget*>(o);
if ((w) && (e->type() == TQEvent::Paint)) { if (w) {
TQPainter p(w); // Update ceData as widget parameters may have changed
TQPainter* activePainterOrig = ceData.activePainter; // If not done glitches may appear such as those present in Bug 1816
const_cast<TQStyleControlElementData&>(ceData).activePainter = &p; populateControlElementDataFromWidget(w, TQStyleOption());
ret = handler->objectEventHandler(ceData, elementFlags, o, e); const TQStyleControlElementData &widgetCEData = *(w->controlElementDataObject());
const_cast<TQStyleControlElementData&>(ceData).activePainter = activePainterOrig; if (e->type() == TQEvent::Paint) {
TQPainter p(w);
TQPainter* activePainterOrig = widgetCEData.activePainter;
const_cast<TQStyleControlElementData&>(widgetCEData).activePainter = &p;
ret = handler->objectEventHandler(widgetCEData, elementFlags, o, e);
const_cast<TQStyleControlElementData&>(widgetCEData).activePainter = activePainterOrig;
}
else {
ret = handler->objectEventHandler(widgetCEData, elementFlags, o, e);
}
} }
else { else {
ret = handler->objectEventHandler(ceData, elementFlags, o, e); ret = handler->objectEventHandler(ceData, elementFlags, o, e);

Write Preview
Loading…
Cancel
Save