on xenial help sign in
drop the special casing
commit1fb8ffc0207a5357e8b2e3fc53e1ac9a0125b872 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 15 Dec 2015, 14:03 (11 years ago) parent5070b7a
2 files changed+2−8
data/com.canonical.Unity8.gschema.xml+1−6 qml/Shell.qml+1−2
data/com.canonical.Unity8.gschema.xml+1−6
@@ -32,16 +32,11 @@
3232 <summary>Autohide the launcher</summary>
3333 <description>This will only be applied in windowed mode. In staged mode, the launcher will always hide.</description>
3434 </key>
35− <key type="b" name="override-launcher-width">
36− <default>false</default>
37− <summary>Override the launcher's size.</summary>
38− <description>When this is true, the launcher's size will be set to launcher-width on all usage modes. When this is false, the launcher will have some defaults per usage mode.</description>
39− </key>
4035 <key type="u" name="launcher-width">
4136 <default>8</default>
4237 <range min="6" max="12"/>
4338 <summary>Width of the launcher in grid units.</summary>
44− <description>This width will applied to the launcher in all usage modes if "override-launcher-width" is true.</description>
39+ <description>Changes the width of the launcher in all usage modes.</description>
4540 </key>
4641 </schema>
4742
qml/Shell.qml+1−2
@@ -562,8 +562,7 @@ Item {
562562 shadeBackground: !tutorial.running
563563 superPressed: physicalKeysMapper.superPressed
564564 superTabPressed: physicalKeysMapper.superTabPressed
565− panelWidth: launcherSettings.overrideLauncherWidth ? units.gu(launcherSettings.launcherWidth)
566− : (shell.usageScenario == "desktop" ? units.gu(10) : units.gu(8))
565+ panelWidth: units.gu(launcherSettings.launcherWidth)
567566 lockedVisible: shell.usageScenario == "desktop" && !launcherSettings.autohideLauncher
568567
569568 GSettings {