1
=== modified file 'modules/Ubuntu/Components/Panel.qml'
2
--- modules/Ubuntu/Components/Panel.qml	2013-09-09 19:11:39 +0000
3
+++ modules/Ubuntu/Components/Panel.qml	2013-09-20 08:59:16 +0000
4
@@ -534,6 +534,8 @@
5
534
        //position will always be in the range 0..size, where position==0 means spread, position==size means hidden.
534
        //position will always be in the range 0..size, where position==0 means spread, position==size means hidden.
6
535
        property real position: panel.opened ? 0 : size
535
        property real position: panel.opened ? 0 : size
7
536
536
8
537
        onPositionChanged: bottomBarVisibilityCommunicator.position = size - position
9
538
10
537
        y: internal.align === Qt.AlignTop ? -position : internal.align === Qt.AlignBottom ? position : 0
539
        y: internal.align === Qt.AlignTop ? -position : internal.align === Qt.AlignBottom ? position : 0
11
538
        x: internal.align === Qt.AlignLeft ? -position : internal.align === Qt.AlignRight ? position : 0
540
        x: internal.align === Qt.AlignLeft ? -position : internal.align === Qt.AlignRight ? position : 0
12
539
    }
541
    }
13
540
542
14
=== modified file 'modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.cpp'
15
--- modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.cpp	2013-02-27 12:45:08 +0000
16
+++ modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.cpp	2013-09-20 08:59:16 +0000
17
@@ -35,7 +35,8 @@
18
35
35
19
36
BottomBarVisibilityCommunicator::BottomBarVisibilityCommunicator()
36
BottomBarVisibilityCommunicator::BottomBarVisibilityCommunicator()
20
37
 : m_shellDbusIface(NULL),
37
 : m_shellDbusIface(NULL),
22
38
   m_forceHidden(false)
38
   m_forceHidden(false),
23
39
   m_position(0)
24
39
{
40
{
25
40
    m_shellDbusIface = new QDBusInterface(DBUS_SERVICE, BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH, BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_INTERFACE, QDBusConnection::sessionBus(), this);
41
    m_shellDbusIface = new QDBusInterface(DBUS_SERVICE, BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH, BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_INTERFACE, QDBusConnection::sessionBus(), this);
26
41
    if (m_shellDbusIface->isValid()) {
42
    if (m_shellDbusIface->isValid()) {
27
@@ -51,6 +52,20 @@
28
51
    return m_forceHidden;
52
    return m_forceHidden;
29
52
}
53
}
30
53
54
31
55
double BottomBarVisibilityCommunicator::position() const
32
56
{
33
57
    return m_position;
34
58
}
35
59
36
60
void BottomBarVisibilityCommunicator::setPosition(double position)
37
61
{
38
62
    if (position != m_position) {
39
63
        m_position = position;
40
64
        m_shellDbusIface->setProperty("position", position);
41
65
        Q_EMIT positionChanged(position);
42
66
    }
43
67
}
44
68
45
54
void BottomBarVisibilityCommunicator::onShellForceHiddenChanged(bool forceHidden)
69
void BottomBarVisibilityCommunicator::onShellForceHiddenChanged(bool forceHidden)
46
55
{
70
{
47
56
    if (forceHidden != m_forceHidden) {
71
    if (forceHidden != m_forceHidden) {
48
57
72
49
=== modified file 'modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.h'
50
--- modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.h	2013-02-11 17:47:48 +0000
51
+++ modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.h	2013-09-20 08:59:16 +0000
52
@@ -26,6 +26,7 @@
53
26
{
26
{
54
27
    Q_OBJECT
27
    Q_OBJECT
55
28
    Q_PROPERTY(bool forceHidden READ forceHidden NOTIFY forceHiddenChanged)
28
    Q_PROPERTY(bool forceHidden READ forceHidden NOTIFY forceHiddenChanged)
56
29
    Q_PROPERTY(double position READ position WRITE setPosition NOTIFY positionChanged)
57
29
30
58
30
public:
31
public:
59
31
    static BottomBarVisibilityCommunicator& instance() {
32
    static BottomBarVisibilityCommunicator& instance() {
60
@@ -34,9 +35,12 @@
61
34
    }
35
    }
62
35
36
63
36
    bool forceHidden() const;
37
    bool forceHidden() const;
64
38
    double position() const;
65
39
    void setPosition(double position);
66
37
40
67
38
Q_SIGNALS:
41
Q_SIGNALS:
68
39
    void forceHiddenChanged(bool forceHidden);
42
    void forceHiddenChanged(bool forceHidden);
69
43
    void positionChanged(double position);
70
40
44
71
41
private Q_SLOTS:
45
private Q_SLOTS:
72
42
    void onShellForceHiddenChanged(bool forceHidden);
46
    void onShellForceHiddenChanged(bool forceHidden);
73
@@ -46,6 +50,8 @@
74
46
50
75
47
    QDBusInterface* m_shellDbusIface;
51
    QDBusInterface* m_shellDbusIface;
76
48
52
77
53
    double m_position;
78
54
79
49
    // This is cached from dbus
55
    // This is cached from dbus
80
50
    bool m_forceHidden;
56
    bool m_forceHidden;
81
51
};
57
};
Reviewer	Review Type	Date Requested	Status
Michał Sawicz		2013-09-20	Approve on 2013-10-03
PS Jenkins bot	continuous-integration		Approve on 2013-09-24
Review via email: mp+186727@code.launchpad.net