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

Deprecate KDecoration's AbilityColor

Browse source 
Nobody is interested in whether the Abilities are supported.
There is one method in KWin core checking for the colors
supported by the currently loaded decoration:
Workspace::decorationSupportedColors

This method is not called from anywhere inside KWin, but is
part of the D-Bus interface, though nobody in KDE's repository
is calling it [1].

As it is part of public API the Abilities are only deprecated
and scheduled for removal with the next big break.

[1] http://lxr.kde.org/search?filestring=&string=decorationSupportedColors

REVIEW: 105785
This commit is contained in:
Martin Gräßlin 2012-07-29 22:25:03 +02:00
parent 2764565f9d
commit 8bfffed27d
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libkdecorations/kdecoration.h
View file

@ -186,7 +186,7 @@ public:
enum Ability {
// announce
AbilityAnnounceButtons = 0, ///< decoration supports AbilityButton* values (always use)
AbilityAnnounceColors = 1, ///< decoration supports AbilityColor* values (always use)
AbilityAnnounceColors = 1, ///< decoration supports AbilityColor* values (always use), @deprecated @todo remove KDE5
// buttons
AbilityButtonMenu = 1000, ///< decoration supports the menu button
AbilityButtonOnAllDesktops = 1001, ///< decoration supports the on all desktops button
@ -200,15 +200,15 @@ public:
AbilityButtonShade = 1009, ///< decoration supports a shade button
AbilityButtonResize = 1010, ///< decoration supports a resize button
// colors
AbilityColorTitleBack = 2000, ///< decoration supports titlebar background color
ABILITYCOLOR_FIRST = AbilityColorTitleBack, ///< @internal
AbilityColorTitleFore = 2001, ///< decoration supports titlebar foreground color
AbilityColorTitleBlend = 2002, ///< decoration supports second titlebar background color
AbilityColorFrame = 2010, ///< decoration supports frame color
AbilityColorHandle = 2011, ///< decoration supports resize handle color
AbilityColorButtonBack = 2020, ///< decoration supports button background color
AbilityColorButtonFore = 2021, ///< decoration supports button foreground color
ABILITYCOLOR_END, ///< @internal
AbilityColorTitleBack = 2000, ///< decoration supports titlebar background color, @deprecated @todo remove KDE5
ABILITYCOLOR_FIRST = AbilityColorTitleBack, ///< @internal, @deprecated @todo remove KDE5
AbilityColorTitleFore = 2001, ///< decoration supports titlebar foreground color, @deprecated @todo remove KDE5
AbilityColorTitleBlend = 2002, ///< decoration supports second titlebar background color, @deprecated @todo remove KDE5
AbilityColorFrame = 2010, ///< decoration supports frame color, @deprecated @todo remove KDE5
AbilityColorHandle = 2011, ///< decoration supports resize handle color, @deprecated @todo remove KDE5
AbilityColorButtonBack = 2020, ///< decoration supports button background color, @deprecated @todo remove KDE5
AbilityColorButtonFore = 2021, ///< decoration supports button foreground color, @deprecated @todo remove KDE5
ABILITYCOLOR_END, ///< @internal, @deprecated @todo remove KDE5
// compositing
AbilityProvidesShadow = 3000, ///< The decoration draws its own shadows.
/// @since 4.3

1
org.kde.KWin.xml
View file

@ -68,6 +68,7 @@
<method name="waitForCompositingSetup">
<arg type="b" direction="out"/>
</method>
<!-- @deprecated, @todo remove KDE5 -->
<method name="decorationSupportedColors">
<arg type="ai" direction="out"/>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QList&lt;int>"/>

4
workspace.h
View file

@ -448,6 +448,10 @@ public:
void cascadeDesktop();
void unclutterDesktop();
void doNotManage(const QString&);
/**
* @deprecated
* @todo: remove KDE5
**/
QList<int> decorationSupportedColors() const;
void nextDesktop();
void previousDesktop();