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

Remove dynamic desktop layout

Browse source 
This has never been implemented properly. There is only the boolean
indicating that the desktop layout is dynamic but it is nowhere set
or used. So better remove it.
This commit is contained in:
Martin Gräßlin 2011-03-13 14:04:02 +01:00
parent 9199619969
commit 16a025d907
5 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
effects.cpp
View file

@ -677,11 +677,6 @@ int EffectsHandlerImpl::desktopToLeft(int desktop, bool wrap) const
return Workspace::self()->desktopToLeft(desktop, wrap); return Workspace::self()->desktopToLeft(desktop, wrap);
} }
bool EffectsHandlerImpl::isDesktopLayoutDynamic() const
{
return Workspace::self()->isDesktopLayoutDynamic();
}
QString EffectsHandlerImpl::desktopName(int desktop) const QString EffectsHandlerImpl::desktopName(int desktop) const
{ {
return Workspace::self()->desktopName(desktop); return Workspace::self()->desktopName(desktop);

1
effects.h
View file

@ -83,7 +83,6 @@ public:
virtual int desktopToRight(int desktop = 0, bool wrap = true) const; virtual int desktopToRight(int desktop = 0, bool wrap = true) const;
virtual int desktopBelow(int desktop = 0, bool wrap = true) const; virtual int desktopBelow(int desktop = 0, bool wrap = true) const;
virtual int desktopToLeft(int desktop = 0, bool wrap = true) const; virtual int desktopToLeft(int desktop = 0, bool wrap = true) const;
virtual bool isDesktopLayoutDynamic() const;
virtual QString desktopName(int desktop) const; virtual QString desktopName(int desktop) const;
virtual bool optionRollOverDesktops() const; virtual bool optionRollOverDesktops() const;

4
libkwineffects/kwineffects.h
View file

@ -663,10 +663,6 @@ public:
* right of the layout if @a wrap is set. If @a id is not set use the current one. * right of the layout if @a wrap is set. If @a id is not set use the current one.
*/ */
virtual int desktopToLeft(int desktop = 0, bool wrap = true) const = 0; virtual int desktopToLeft(int desktop = 0, bool wrap = true) const = 0;
/**
* @returns Whether or not the desktop layout is allowed to be modified by the user.
*/
virtual bool isDesktopLayoutDynamic() const = 0;
virtual QString desktopName(int desktop) const = 0; virtual QString desktopName(int desktop) const = 0;
virtual bool optionRollOverDesktops() const = 0; virtual bool optionRollOverDesktops() const = 0;

1
workspace.cpp
View file

@ -100,7 +100,6 @@ Workspace::Workspace(bool restore)
, desktopGridSize_(1, 2) // Default to two rows , desktopGridSize_(1, 2) // Default to two rows
, desktopGrid_(new int[2]) , desktopGrid_(new int[2])
, currentDesktop_(0) , currentDesktop_(0)
, desktopLayoutDynamicity_(false)
, tilingEnabled_(false) , tilingEnabled_(false)
// Unsorted // Unsorted
, active_popup(NULL) , active_popup(NULL)

20
workspace.h
View file

@ -310,15 +310,6 @@ public:
*/ */
int desktopToLeft(int id = 0, bool wrap = true) const; int desktopToLeft(int id = 0, bool wrap = true) const;
/**
* @returns Whether or not the layout is allowed to be modified by the user.
*/
bool isDesktopLayoutDynamic() const;
/**
* Sets whether or not this layout can be modified by the user.
*/
void setDesktopLayoutDynamicity(bool dynamicity);
private: private:
int desktopCount_; int desktopCount_;
QSize desktopGridSize_; QSize desktopGridSize_;
@ -326,7 +317,6 @@ private:
int currentDesktop_; int currentDesktop_;
QString activity_; QString activity_;
QStringList allActivities_; QStringList allActivities_;
bool desktopLayoutDynamicity_;
KActivityController activityController_; KActivityController activityController_;
@ -1309,16 +1299,6 @@ inline int Workspace::desktopAtCoords(QPoint coords) const
return desktopGrid_[coords.y() * desktopGridSize_.width() + coords.x()]; return desktopGrid_[coords.y() * desktopGridSize_.width() + coords.x()];
} }
inline bool Workspace::isDesktopLayoutDynamic() const
{
return desktopLayoutDynamicity_;
}
inline void Workspace::setDesktopLayoutDynamicity(bool dynamicity)
{
desktopLayoutDynamicity_ = dynamicity;
}
//--------------------------------------------------------- //---------------------------------------------------------
// Unsorted // Unsorted