Unity

Merge lp://staging/~ruben-verweij/unity/fix-677594-workspaces into lp://staging/unity

fix-677594-workspaces
Merge into trunk

Proposed by Ruben Verweij on 2010-12-08

Status:

Superseded

Proposed branch:

lp://staging/~ruben-verweij/unity/fix-677594-workspaces

Merge into:

lp://staging/unity

Diff against target:

171 lines (+77/-21) (has conflicts)

4 files modified

src/LauncherController.cpp (+38/-13)
src/LauncherController.h (+13/-8)
src/unity.cpp (+21/-0)
src/unity.h (+5/-0)

Text conflict in src/unity.cpp

To merge this branch:

bzr merge lp://staging/~ruben-verweij/unity/fix-677594-workspaces

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Neil J. Patel (community)		2010-12-08	Needs Fixing on 2010-12-09
Review via email: mp+43060@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2010-12-09.

Description of the change

Fix launchpad bug 677594 so the Workspace switcher is not shown when there is only one workspace. This uses GConf to check if the number of workspaces Compiz uses is greater than 1.

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2010-12-09:

Hi,

You don't need to use gconf to do this, you can just ask compiz directly for the number of workspaces with screen->vpSize ().width ();

Also if you want to be notified when this number changes you can implement a

bool
UnityScreen::setOptionForPlugin (const char *plugin, const char *name, CompOption::Value &v) and make sure that UnityScreen inherits ScreenInterface (and that we call ScreenInterface::setHandler (screen) in the UnityScreen construtor) and then check for plugin == "core" and name == "hsize" and react on that change.

See git.compiz.org/compiz/core/plugins/cube/src/cube.cpp:1622 for some ideas on this.

Remind me that this method is full of suck and I need to change it.

Revision history for this message

Neil J. Patel (njpatel) wrote on 2010-12-09:

As per sams comment

review: Needs Fixing