diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-01-14 16:01:49 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-01-14 16:01:49 +0000 |
| commit | bbab47c6c933e1e1c3f851db87076fc885b3c53b (patch) | |
| tree | c4595e3c98a260bab48d37a342b3fdc4002fd6b6 /src/ui | |
| parent | Re-enable snapping on release, for now. (diff) | |
| parent | Merge GSoC 2009 node tool rewrite (diff) | |
| download | inkscape-bbab47c6c933e1e1c3f851db87076fc885b3c53b.tar.gz inkscape-bbab47c6c933e1e1c3f851db87076fc885b3c53b.zip | |
Merge from trunk
(bzr r8846.2.17)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/uxmanager.cpp | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp index ddc28a858..d5fa90406 100644 --- a/src/ui/uxmanager.cpp +++ b/src/ui/uxmanager.cpp @@ -89,18 +89,26 @@ void UXManager::setTask(SPDesktop* dt, gint val) for (vector<SPDesktopWidget*>::iterator it = dtws.begin(); it != dtws.end(); ++it) { SPDesktopWidget* dtw = *it; if (dtw->desktop == dt) { - if (val == 0) { - dtw->setToolboxPosition("ToolToolbar", GTK_POS_LEFT); - dtw->setToolboxPosition("CommandsToolbar", GTK_POS_TOP); - dtw->setToolboxPosition("SnapToolbar", GTK_POS_TOP); - // for now skip "AuxToolbar"; - } else { - dtw->setToolboxPosition("ToolToolbar", GTK_POS_TOP); - dtw->setToolboxPosition("CommandsToolbar", GTK_POS_LEFT); - dtw->setToolboxPosition("SnapToolbar", GTK_POS_RIGHT); - // for now skip "AuxToolbar"; + switch (val) { + default: + case 0: + dtw->setToolboxPosition("ToolToolbar", GTK_POS_LEFT); + dtw->setToolboxPosition("CommandsToolbar", GTK_POS_TOP); + //dtw->setToolboxPosition("AuxToolbar", GTK_POS_TOP); + dtw->setToolboxPosition("SnapToolbar", GTK_POS_TOP); + break; + case 1: + dtw->setToolboxPosition("ToolToolbar", GTK_POS_TOP); + dtw->setToolboxPosition("CommandsToolbar", GTK_POS_LEFT); + //dtw->setToolboxPosition("AuxToolbar", GTK_POS_TOP); + dtw->setToolboxPosition("SnapToolbar", GTK_POS_RIGHT); + break; + case 2: + dtw->setToolboxPosition("ToolToolbar", GTK_POS_LEFT); + dtw->setToolboxPosition("CommandsToolbar", GTK_POS_RIGHT); + dtw->setToolboxPosition("SnapToolbar", GTK_POS_RIGHT); + //dtw->setToolboxPosition("AuxToolbar", GTK_POS_RIGHT); } - break; } } } |