Merge lp:~feng-kylin/unity8/fix-lp1431566 into lp:unity8

[handsome_feng]

Make the WindowControlButtons show only under windowed mode

Make the WindowControlButtons show only under windowed mode.

[Michael Zanetti (mzanetti)]

Thanks for the contribution. Unfortunately this is not really how it should be done. "usageModeSettings" is not part of Panel.qml. It is bad practice to reach out of context like this and will cause a mess in the long run.

Also, there are more issues with those buttons and I already have a branch upcoming that improves the situation. I'm very sorry. I should have marked the bug as "in progress".

[Michael Zanetti (mzanetti)]

I've just pushed my local code to here: https://code.launchpad.net/~mzanetti/unity8/panel-buttons-fixes/+merge/256490

It is not finished yet as it's lacking tests still.

[handsome_feng (feng-kylin)]

> I've just pushed my local code to here:
> https://code.launchpad.net/~mzanetti/unity8/panel-buttons-fixes/+merge/256490
>
> It is not finished yet as it's lacking tests still.

oh, it doesn't matter, i thank it is a good change of learning form you. :)

Unmerged revisions

1731. By handsome_feng on 2015-04-16

Make the WindowControlButtons show only under windowed mode

=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2015-04-02 15:08:05 +0000
+++ qml/Panel/Panel.qml	2015-04-16 11:33:52 +0000
@@ -159,7 +159,7 @@
                 margins: units.gu(0.7)
             }
             height: indicators.minimizedPanelHeight - anchors.margins * 2
-            visible: PanelState.buttonsVisible
+            visible: PanelState.buttonsVisible && usageModeSettings.usageMode === "Windowed"
             onClose: PanelState.close()
             onMinimize: PanelState.minimize()
             onMaximize: PanelState.maximize()