~townsend/compiz/fix-lp1304531

Committer: CI bot
Author(s): Chris Townsend
Date: 2014-04-23 14:55:14 UTC
mfrom: (3856.1.1 compiz.commit)
Revision ID: ps-jenkins@lists.canonical.com-20140423145514-yj3xu8yy8anvpe05

Remove the Number of Desktops option in CCSM as this option confuses Compiz and is really no longer needed since the Horizontal/Vertical Virtual Desktop Size is what is used for determining the size. Fixes: 1289820

files modified:
metadata/core.xml.in

src/event.cpp

src/screen.cpp

Show diffs side-by-side

added added

removed removed

src/screen.cpp

739

740

setVirtualScreenSize (optionGetHsize (), optionGetVsize ());

741

break;

742

case CoreOptions::NumberOfDesktops:

743

setNumberOfDesktops (optionGetNumberOfDesktops ());

744

break;

745

742

case CoreOptions::DefaultIcon:

746

743

return screen->updateDefaultIcon ();

747

744

break;

972

969

}

973

970

974

971

void

975

cps::WindowManager::setNumberOfDesktops(unsigned int desktops) const

976

{

977

for (iterator i = windows.begin(); i != windows.end(); ++i)

978

{

979

CompWindow* const w(*i);

980

if (w->desktop () == 0xffffffff)

981

continue;

982

983

if (w->desktop () >= desktops)

984

w->setDesktop (desktops - 1);

985

}

986

}

987

988

void

989

972

cps::WindowManager::updateWindowSizes() const

990

973

{

991

974

CompWindow::Geometry before, after;

4012

3995

}

4013

3996

4014

3997

void

4015

PrivateScreen::setNumberOfDesktops (unsigned int nDesktop)

4016

{

4017

if (nDesktop < 1 || nDesktop >= 0xffffffff || nDesktop == this->nDesktop)

4018

return;

4019

4020

if (currentDesktop >= nDesktop)

4021

currentDesktop = nDesktop - 1;

4022

4023

windowManager.setNumberOfDesktops(nDesktop);

4024

4025

this->nDesktop = nDesktop;

4026

4027

setDesktopHints ();

4028

}

4029

4030

void

4031

3998

PrivateScreen::setCurrentDesktop (unsigned int desktop)

4032

3999

{

4033

4000

if (desktop >= nDesktop || desktop == currentDesktop)

Older »