yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

these are all cheap to pass around and make ebn happy

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=692309
This commit is contained in:
Aaron J. Seigo 2007-07-25 10:28:57 +00:00
parent 52cb163760
commit dd72494b2b
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/kdecoration.cpp
View file

@ -378,12 +378,12 @@ KDecorationOptions::~KDecorationOptions()
KDecoration::options_ = NULL; KDecoration::options_ = NULL;
} }
const QColor& KDecorationOptions::color(ColorType type, bool active) const QColor KDecorationOptions::color(ColorType type, bool active) const
{ {
return(d->colors[type + (active ? 0 : NUM_COLORS)]); return(d->colors[type + (active ? 0 : NUM_COLORS)]);
} }
const QFont& KDecorationOptions::font(bool active, bool small) const QFont KDecorationOptions::font(bool active, bool small) const
{ {
if ( small ) if ( small )
return(active ? d->activeFontSmall : d->inactiveFontSmall); return(active ? d->activeFontSmall : d->inactiveFontSmall);
@ -391,7 +391,7 @@ const QFont& KDecorationOptions::font(bool active, bool small) const
return(active ? d->activeFont : d->inactiveFont); return(active ? d->activeFont : d->inactiveFont);
} }
const QPalette& KDecorationOptions::palette(ColorType type, bool active) const QPalette KDecorationOptions::palette(ColorType type, bool active) const
{ {
int idx = type + (active ? 0 : NUM_COLORS); int idx = type + (active ? 0 : NUM_COLORS);
if(d->pal[idx]) if(d->pal[idx])

6
lib/kdecoration.h
View file

@ -196,7 +196,7 @@ public:
* @param type The requested color type. * @param type The requested color type.
* @param active Whether the color should be for active or inactive windows. * @param active Whether the color should be for active or inactive windows.
*/ */
const QColor& color(ColorType type, bool active=true) const; QColor color(ColorType type, bool active=true) const;
/** /**
* Returns a palette using the given decoration color as the background. * Returns a palette using the given decoration color as the background.
* The changed flags for this setting is SettingColors. * The changed flags for this setting is SettingColors.
@ -204,7 +204,7 @@ public:
* @param type The requested color type. * @param type The requested color type.
* @param active Whether to return the color for active or inactive windows. * @param active Whether to return the color for active or inactive windows.
*/ */
const QPalette& palette(ColorType type, bool active=true) const; QPalette palette(ColorType type, bool active=true) const;
/** /**
* Returns the active or inactive decoration font. * Returns the active or inactive decoration font.
* The changed flags for this setting is SettingFont. * The changed flags for this setting is SettingFont.
@ -212,7 +212,7 @@ public:
* @param active Whether to return the color for active or inactive windows. * @param active Whether to return the color for active or inactive windows.
* @param small If @a true, returns a font that's suitable for tool windows. * @param small If @a true, returns a font that's suitable for tool windows.
*/ */
const QFont& font(bool active=true, bool small = false) const; QFont font(bool active=true, bool small = false) const;
/** /**
* Returns @a true if the style should use custom button positions * Returns @a true if the style should use custom button positions
* The changed flags for this setting is SettingButtons. * The changed flags for this setting is SettingButtons.