← Back to branch summary

~schwann/ubuntu-keyboard/keyboard-delete-words

« back to all changes in this revision

Viewing changes to qml/KeyboardContainer.qml

fixes #1236501 wrong layout when symbols.

Approved by PS Jenkins bot, Günter Schwann.

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/KeyboardContainer.qml
26
26
    property int keyHeight: 0
27
27
 
28
28
    property Item activeKeypad: characterKeypadLoader.item
29
 
    property string activeKeypadState: characterKeypadLoader.item ? item.state : ""
 
29
    property string activeKeypadState: "NORMAL"
30
30
    property string characterKeypadSource: ""
31
31
    property string symbolKeypadSource: activeKeypad ? activeKeypad.symbols : ""
32
32
 
61
61
        anchors.fill: parent
62
62
        asynchronous: false
63
63
        source: panel.state === "CHARACTERS" ? characterKeypadSource : symbolKeypadSource
 
64
        onLoaded: activeKeypadState = "NORMAL"
64
65
    }
65
66
    ExtendedKeysSelector {
66
67
        id: extendedKeysSelector
75
76
    states: [
76
77
        State {
77
78
            name: "CHARACTERS"
78
 
            PropertyChanges {
79
 
                target: panel
80
 
                activeKeypad: characterKeypadLoader.item
81
 
            }
82
79
        },
83
80
        State {
84
81
            name: "SYMBOLS"
85
 
            PropertyChanges {
86
 
                target: panel
87
 
                activeKeypad: symbolKeypadLoader.item
88
 
            }
89
82
        }
90
83
    ]
91
84