← Back to branch summary

~ubuntu-sdk-team/ubuntu-ui-toolkit/bottomKeyboard

« back to all changes in this revision

Viewing changes to src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml

  • Committer: Tarmac
  • Author(s): Zsombor Egri
  • Date: 2016-01-27 17:49:36 UTC
  • mfrom: (1814.2.23 paleette2)
  • Revision ID: tarmac-20160127174936-3bcz1l7w5wlibq05
Palette fix. Update components to use the palette. Fixes: https://bugs.launchpad.net/bugs/1495477.

Approved by ubuntu-sdk-build-bot, Tim Peeters, Christian Dywan, Zoltan Balogh.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml
1
1
/*
2
 
 * Copyright 2015 Canonical Ltd.
 
2
 * Copyright 2016 Canonical Ltd.
3
3
 *
4
4
 * This program is free software; you can redistribute it and/or modify
5
5
 * it under the terms of the GNU Lesser General Public License as published by
28
28
     */
29
29
    property color foregroundColor: styledItem.enabled
30
30
                                    ? theme.palette.normal.backgroundText
31
 
                                    : theme.palette.inactive.backgroundText
 
31
                                    : theme.palette.disabled.backgroundText
32
32
 
33
33
    /*!
34
34
      The background color of the button.
35
35
     */
36
36
    property color backgroundColor: styledItem.pressed ?
37
 
                                        theme.palette.selected.background :
 
37
                                        theme.palette.highlighted.background :
38
38
                                        "transparent"
39
39
 
40
40
    property real iconWidth: units.gu(2)
45
45
     */
46
46
    property bool showLabel: false
47
47
 
48
 
    FocusShape {
49
 
    }
50
 
 
51
48
    Rectangle {
52
49
        id: background
53
50
        color: iconButtonStyle.backgroundColor
61
58
        height: iconButtonStyle.iconHeight
62
59
        source: styledItem.iconSource
63
60
        color: iconButtonStyle.foregroundColor
 
61
 
 
62
        FocusShape {
 
63
        }
64
64
    }
65
65
 
66
66
    Component {