← Back to branch summary

~thomas-moenicke/phablet-extras/maliit-plugins_fix_focus_out

« back to all changes in this revision

Viewing changes to maliit-keyboard/lib/logic/keyareaconverter.cpp

  • Committer: Tarmac
  • Author(s): Thomas Moenicke
  • Date: 2013-03-26 13:49:55 UTC
  • mfrom: (2107.1.5 maliit-plugins-0.94.0)
  • Revision ID: tarmac-20130326134955-qhv19rwum8b81f7u
upgraded to maliit 0.94.0
updated maliit-keyboard, UI is using QML now
.

Approved by Bill Filler, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
maliit-keyboard/lib/logic/keyareaconverter.cpp
58
58
//!        extended keys (optional).
59
59
KeyArea createFromKeyboard(StyleAttributes *attributes,
60
60
                           const Keyboard &source,
61
 
                           Layout::Orientation orientation,
 
61
                           LayoutHelper::Orientation orientation,
62
62
                           bool is_extended_keyarea = false)
63
63
{
64
64
    // An ad-hoc geometry updater that also uses styling information.
116
116
        const qreal key_margin((at_row_start || at_row_end) ? margin + padding : margin * 2);
117
117
 
118
118
        Area area;
119
 
        area.setBackground(attributes->keyBackground(desc.style, KeyDescription::NormalState));
 
119
        area.setBackground(attributes->keyBackground(key.style(), KeyDescription::NormalState));
120
120
        area.setBackgroundBorders(bg_margins);
121
121
        area.setSize(QSize(width + key_margin, key_height));
122
122
        key.setArea(area);
206
206
                                   KeyboardLoader *loader)
207
207
    : m_attributes(attributes)
208
208
    , m_loader(loader)
209
 
    , m_orientation(Layout::Landscape)
 
209
    , m_orientation(LayoutHelper::Landscape)
210
210
{
211
211
    if (not attributes || not loader) {
212
212
        qFatal("Neither attributes nor loader can be null.");
220
220
 
221
221
//! \brief Sets the layout orientation used for creating key areas.
222
222
//! \param orientation The layout orientation. Default: landscape.
223
 
void KeyAreaConverter::setLayoutOrientation(Layout::Orientation orientation)
 
223
void KeyAreaConverter::setLayoutOrientation(LayoutHelper::Orientation orientation)
224
224
{
225
225
    m_orientation = orientation;
226
226
}