← Back to branch summary

~ci-train-bot/unity8/unity8-ubuntu-zesty-2663

« back to all changes in this revision

Viewing changes to qml/Panel/Panel.qml

  • Committer: Nick Dedekind
  • Date: 2017-03-15 15:22:07 UTC
  • mfrom: (2868 unity8)
  • mto: This revision was merged to the branch mainline in revision 2892.
  • Revision ID: nick.dedekind@canonical.com-20170315152207-9ts6lyu1v2pruue2
merged with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Panel/Panel.qml
23
23
import Unity.ApplicationMenu 0.1
24
24
 
25
25
import QtQuick.Window 2.2
26
 
// for indicator-keyboard
27
 
import AccountsService 0.1
28
 
import Unity.InputInfo 0.1
29
26
 
30
27
import "../ApplicationMenus"
31
28
import "../Components"
47
44
    property bool fullscreenMode: false
48
45
    property real panelAreaShowProgress: 1.0
49
46
    property bool greeterShown: false
 
47
    property bool hasKeyboard: false
 
48
 
50
49
    property string mode: "staged"
51
50
    property PanelState panelState
52
51
 
231
230
                            target: __indicators
232
231
                            onShownChanged: bar.dismiss();
233
232
                        }
 
233
 
 
234
                        onDoubleClicked: panelState.restoreClicked()
234
235
                    }
235
236
                }
236
237
            }
337
338
                objectName: identifier+"-panelItem"
338
339
 
339
340
                property int ownIndex: index
340
 
                property bool overflow: parent.width - x > __indicators.overFlowWidth
341
 
                property bool hidden: !expanded && (overflow || !indicatorVisible || hideSessionIndicator || hideKeyboardIndicator)
 
341
                readonly property bool overflow: parent.width - x > __indicators.overFlowWidth
 
342
                readonly property bool hidden: !expanded && (overflow || !indicatorVisible || hideSessionIndicator || hideKeyboardIndicator)
342
343
                // HACK for indicator-session
343
344
                readonly property bool hideSessionIndicator: identifier == "indicator-session" && Math.min(Screen.width, Screen.height) <= units.gu(60)
344
345
                // HACK for indicator-keyboard
345
 
                readonly property bool hideKeyboardIndicator: identifier == "indicator-keyboard" && (AccountsService.keymaps.length < 2 || keyboardsModel.count == 0)
 
346
                readonly property bool hideKeyboardIndicator: identifier == "indicator-keyboard" && !hasKeyboard
346
347
 
347
348
                height: parent.height
348
349
                expanded: indicators.expanded
396
397
        }
397
398
    }
398
399
 
399
 
    InputDeviceModel {
400
 
        id: keyboardsModel
401
 
        deviceFilter: InputInfo.Keyboard
402
 
    }
403
 
 
404
400
    IndicatorsLight {
405
401
        id: indicatorLights
406
402
    }