git.iko.soy/unity8
on xenial help sign in
add a gsettings option for the launcher's width
f6aeb81Michael Zanetti
data/com.canonical.Unity8.gschema.xml+11
compare with xenial
unifiedsplit
@@ -32,6 +32,17 @@
32 <summary>Autohide the launcher</summary>
32 <summary>Autohide the launcher</summary>
33 <description>This will only be applied in windowed mode. In staged mode, the launcher will always hide.</description>
33 <description>This will only be applied in windowed mode. In staged mode, the launcher will always hide.</description>
34 </key>
34 </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-size on all usage modes. When this is false, the launcher will have some defaults per usage mode.</description>
39+ </key>
40+ <key type="u" name="launcher-width">
41+ <default>8</default>
42+ <range min="6" max="12"/>
43+ <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-size" is true.</description>
45+ </key>
35 </schema>
46 </schema>
36
47
37 <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
48 <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
qml/Launcher/Launcher.qml+1−1
@@ -292,7 +292,7 @@ FocusScope {
292
292
293 MouseArea {
293 MouseArea {
294 id: launcherDragArea
294 id: launcherDragArea
295− enabled: root.available && (root.state == "visible" || root.state == "visibleTemporary")
295+ enabled: root.available && (root.state == "visible" || root.state == "visibleTemporary") && !root.lockedVisible
296 anchors.fill: panel
296 anchors.fill: panel
297 anchors.rightMargin: -units.gu(2)
297 anchors.rightMargin: -units.gu(2)
298 drag {
298 drag {
qml/Shell.qml+7−2
@@ -372,7 +372,11 @@ Item {
372 InputMethod {
372 InputMethod {
373 id: inputMethod
373 id: inputMethod
374 objectName: "inputMethod"
374 objectName: "inputMethod"
375+ anchors {
376+ fill: parent
375− anchors { fill: parent; topMargin: panel.panelHeight }
377+ topMargin: panel.panelHeight
378+ leftMargin: launcher.lockedVisible ? launcher.panelWidth : 0
379+ }
376 z: notifications.useModal || panel.indicators.shown || wizard.active ? overlay.z + 1 : overlay.z - 1
380 z: notifications.useModal || panel.indicators.shown || wizard.active ? overlay.z + 1 : overlay.z - 1
377 }
381 }
378
382
@@ -558,7 +562,8 @@ Item {
558 shadeBackground: !tutorial.running
562 shadeBackground: !tutorial.running
559 superPressed: physicalKeysMapper.superPressed
563 superPressed: physicalKeysMapper.superPressed
560 superTabPressed: physicalKeysMapper.superTabPressed
564 superTabPressed: physicalKeysMapper.superTabPressed
565+ panelWidth: launcherSettings.overrideLauncherWidth ? units.gu(launcherSettings.launcherWidth)
561− panelWidth: shell.usageScenario == "desktop" ? units.gu(10) : units.gu(8)
566+ : (shell.usageScenario == "desktop" ? units.gu(10) : units.gu(8))
562 lockedVisible: shell.usageScenario == "desktop" && !launcherSettings.autohideLauncher
567 lockedVisible: shell.usageScenario == "desktop" && !launcherSettings.autohideLauncher
563
568
564 GSettings {
569 GSettings {
qml/Stages/DesktopStage.qml+1−1
@@ -459,7 +459,7 @@ AbstractStage {
459
459
460 BlurLayer {
460 BlurLayer {
461 id: blurLayer
461 id: blurLayer
462− anchors.fill: parent
462+ anchors.fill: appContainer
463 source: appContainer
463 source: appContainer
464 visible: false
464 visible: false
465 }
465 }