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

Sync r815426 from oxygen.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=842503
This commit is contained in:
Luboš Luňák 2008-08-05 12:42:02 +00:00
parent b099f15cee
commit 2e14c26fc3
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clients/ozone/oxygen.cpp
View file

@ -142,6 +142,7 @@ bool OxygenFactory::supports( Ability ability ) const
case AbilityButtonMinimize:
case AbilityButtonMaximize:
case AbilityButtonClose:
case AbilityButtonOnAllDesktops:
case AbilityButtonAboveOthers:
case AbilityButtonBelowOthers:
case AbilityButtonSpacer:

5
clients/ozone/oxygenbutton.cpp
View file

@ -234,6 +234,11 @@ void OxygenButton::drawIcon(QPainter *p, QPalette &pal, ButtonType &type)
switch(type)
{
case ButtonSticky:
if(isChecked()) {
QPen newPen = p->pen();
newPen.setColor(KColorScheme(pal.currentColorGroup()).decoration(KColorScheme::HoverColor).color());
p->setPen(newPen);
}
p->drawPoint(QPointF(10.5,10.5));
break;
case ButtonHelp:

9
clients/ozone/oxygenclient.cpp
View file

@ -193,15 +193,14 @@ KCommonDecorationButton *OxygenClient::createButton(::ButtonType type)
return new OxygenButton(*this, i18n("Close"), ButtonClose);
case AboveButton:
return new OxygenButton(*this, i18n("Keep above others"), ButtonAbove);
return new OxygenButton(*this, i18n("Keep Above Others"), ButtonAbove);
case BelowButton:
return new OxygenButton(*this, i18n("Keep below others"), ButtonBelow);
return new OxygenButton(*this, i18n("Keep Below Others"), ButtonBelow);
/*
case OnAllDesktopsButton:
return new OxygenButton(*this, i18n("All Desktops"), ButtonSticky);
*/
return new OxygenButton(*this, i18n("On All Desktops"), ButtonSticky);
default:
return 0;
}