← Back to branch summary

~aacid/unity8/quicklist_selection_tuning

« back to all changes in this revision

Viewing changes to qml/OrientedShell.qml

  • Committer: Bileto Bot
  • Author(s): Lukáš Tinkl
  • Date: 2017-03-08 09:50:07 UTC
  • mfrom: (2808.4.9 osk-indicator-switch)
  • Revision ID: ci-train-bot@canonical.com-20170308095007-v12anwl9x4unrglm
Let the OSK be driven by a switch in indicator-keyboard (LP: #1521518)

Approved by: Michael Sheldon, Michał Sawicz, Unity8 CI Bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/OrientedShell.qml
197
197
        value: !shell.oskEnabled || shell.usageScenario == "desktop"
198
198
    }
199
199
 
 
200
    Binding {
 
201
        target: unity8Settings
 
202
        property: "oskSwitchVisible"
 
203
        value: shell.hasKeyboard
 
204
    }
 
205
 
200
206
    readonly property int supportedOrientations: shell.supportedOrientations
201
207
        & (deviceConfiguration.supportedOrientations == deviceConfiguration.useNativeOrientation
202
208
                ? orientations.native_
268
274
        mode: applicationArguments.mode
269
275
        hasMouse: pointerInputDevices > 0
270
276
        hasKeyboard: keyboardsModel.count > 0
271
 
        // TODO: Factor in if the current screen is a touch screen and if the user wants to
272
 
        //       have multiple keyboards around. For now we only enable one keyboard at a time
273
 
        //       thus hiding it here if there is a physical one around or if we have a second
274
 
        //       screen (the virtual touchpad & osk on the phone) attached.
275
 
        oskEnabled: (keyboardsModel.count === 0 && screens.count === 1) ||
276
 
                    forceOSKEnabled
 
277
 
 
278
        oskEnabled: unity8Settings.alwaysShowOsk || !hasKeyboard || forceOSKEnabled
277
279
 
278
280
        usageScenario: {
279
281
            if (unity8Settings.usageMode === "Windowed") {