~anton0/ubuntu/precise/unity/lp-789979

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/LauncherOptions.cpp

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2012-02-07 17:53:27 UTC
  • Revision ID: package-import@ubuntu.com-20120207175327-azk721jy7azj6lxi
Tags: 5.2.0-0ubuntu2
* Cherry-pick upstream:
  - a fix for a 5.0 crasher (LP: #916228)
  - default configuration now to "always lock"
* debian/profile_upgrade/com.canonical.unity.unity.03.upgrade,
  debian/unity-common.install:
  - enabling user profile upgrade installation
  - switcher per workspace is now the default on upgrade
  - launcher is always locked by default, even on upgrade (LP: #928153)

Show diffs side-by-side

added added

removed removed

Lines of Context:
36
36
  edge_responsiveness = 1.0f;
37
37
  edge_reveal_pressure = 2000;
38
38
  edge_stop_velocity = 4500;
39
 
  hide_mode = LAUNCHER_HIDE_DODGE_WINDOWS;
 
39
  hide_mode = LAUNCHER_HIDE_NEVER;
40
40
  icon_size = 48;
41
41
  launch_animation = LAUNCH_ANIMATION_PULSE;
42
42
  tile_size = 54;
59
59
 
60
60
 
61
61
}
62
 
}
 
 
b'\\ No newline at end of file'
 
62
}