git.iko.soy/unity8
on xenial help sign in
make units.gu(60) the threshold between phone and tablet for the session indicator
f30d6f0Lukáš Tinkl
qml/Panel/IndicatorItemRow.qml+1−1
compare with xenial
unifiedsplit
@@ -186,7 +186,7 @@ Item {
186 property bool overflow: row.width - x > overFlowWidth
186 property bool overflow: row.width - x > overFlowWidth
187 property bool hidden: !expanded && (overflow || !indicatorVisible || hideSessionIndicator)
187 property bool hidden: !expanded && (overflow || !indicatorVisible || hideSessionIndicator)
188 // HACK for indicator-session
188 // HACK for indicator-session
189− readonly property bool hideSessionIndicator: identifier == "indicator-session" && Screen.width < units.gu(50)
189+ readonly property bool hideSessionIndicator: identifier == "indicator-session" && Math.min(Screen.width, Screen.height) <= units.gu(60)
190
190
191 height: row.height
191 height: row.height
192 expanded: root.expanded
192 expanded: root.expanded
qml/Panel/Indicators/MenuItemFactory.qml+1−1
@@ -67,7 +67,7 @@ Item {
67 "indicator-session": {
67 "indicator-session": {
68 "indicator.user-menu-item": Platform.isPC ? userMenuItem : null,
68 "indicator.user-menu-item": Platform.isPC ? userMenuItem : null,
69 "indicator.guest-menu-item": Platform.isPC ? userMenuItem : null,
69 "indicator.guest-menu-item": Platform.isPC ? userMenuItem : null,
70− "com.canonical.indicator.switch": Screen.width >= units.gu(90) ? switchMenu : null // Desktop mode switch
70+ "com.canonical.indicator.switch": Math.min(Screen.width, Screen.height) > units.gu(60) ? switchMenu : null // Desktop mode switch
71 },
71 },
72 "indicator-messages" : {
72 "indicator-messages" : {
73 "com.canonical.indicator.button" : messagesButtonMenu
73 "com.canonical.indicator.button" : messagesButtonMenu