Merge lp:~ricmm/qtubuntu/papi-setdimensions into lp:qtubuntu

Proposed by Ricardo Mendoza on 2013-12-11
Status: Merged
Approved by: Gerry Boland on 2014-01-09
Approved revision: 200
Merged at revision: 200
Proposed branch: lp:~ricmm/qtubuntu/papi-setdimensions
Merge into: lp:qtubuntu
Diff against target: 64 lines (+15/-2)
4 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
src/platforms/ubuntu/ubuntucommon/screen.cc (+7/-1)
src/platforms/ubuntu/ubuntucommon/window.cc (+1/-0)
To merge this branch: bzr merge lp:~ricmm/qtubuntu/papi-setdimensions
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2014-01-09
Gerry Boland (community) 2013-12-11 Approve on 2014-01-07
Review via email: mp+198498@code.launchpad.net

Commit message

Use set_dimensions() for initial surface parameters.

To post a comment you must log in.
Gerry Boland (gerboland) wrote :

LGTM

Andrea Cimitan (cimi) wrote :

Changed status to needs review to trigger CI build :)

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Gerry Boland (gerboland) wrote :

LGTM

review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/qtubuntu-autolanding/47/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-autolanding/8/console

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/qtubuntu-autolanding/49/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-autolanding/10/console

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/qtubuntu-autolanding/50/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-autolanding/11/console

review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-11-25 14:32:23 +0000
3+++ debian/changelog 2013-12-20 04:46:44 +0000
4@@ -1,3 +1,9 @@
5+qtubuntu (0.53-0ubuntu1) trusty; urgency=low
6+
7+ * Specify surface size on creation.
8+
9+ -- Ricardo Mendoza <ricardo.mendoza@canonical.com> Tue, 10 Dec 2013 23:31:28 -0500
10+
11 qtubuntu (0.52+14.04.20131125-0ubuntu1) trusty; urgency=low
12
13 [ Daniel d'Andrada ]
14
15=== modified file 'debian/control'
16--- debian/control 2013-11-22 15:45:47 +0000
17+++ debian/control 2013-12-20 04:46:44 +0000
18@@ -10,7 +10,7 @@
19 libgles2-mesa-dev,
20 libglib2.0-dev,
21 libhybris-dev,
22- libplatform-api1-dev (>= 0.18.1daily13.06.11),
23+ libplatform-api1-dev (>= 0.20),
24 libudev-dev,
25 libunity-api-dev,
26 libxrender-dev,
27
28=== modified file 'src/platforms/ubuntu/ubuntucommon/screen.cc'
29--- src/platforms/ubuntu/ubuntucommon/screen.cc 2013-08-02 16:34:13 +0000
30+++ src/platforms/ubuntu/ubuntucommon/screen.cc 2013-12-20 04:46:44 +0000
31@@ -51,6 +51,9 @@
32 // FIXME(loicm) Hard-coded to 40 grid units for now.
33 const int kSideStageWidth = 40;
34
35+// Lifted from shell to determine form factor
36+const int kTabletMinSize = 60;
37+
38 QUbuntuScreen::QUbuntuScreen(UApplicationOptions *options) {
39 // Retrieve units from the environment.
40 int gridUnit = kDefaultGridUnit;
41@@ -83,7 +86,10 @@
42 ua_ui_display_destroy(display);
43
44 // Store geometries depending on the stage hint.
45- const UAUiStage kStageHint = static_cast<UAUiStage>(u_application_options_get_stage(options));
46+ UAUiStage kStageHint = static_cast<UAUiStage>(u_application_options_get_stage(options));
47+ if (kScreenWidth/gridUnit < kTabletMinSize)
48+ kStageHint = U_MAIN_STAGE;
49+
50 DASSERT(kStageHint == U_MAIN_STAGE || kStageHint == U_SIDE_STAGE);
51 if (kStageHint != U_SIDE_STAGE) {
52 geometry_ = QRect(0, 0, kScreenWidth, kScreenHeight);
53
54=== modified file 'src/platforms/ubuntu/ubuntucommon/window.cc'
55--- src/platforms/ubuntu/ubuntucommon/window.cc 2013-10-09 12:11:20 +0000
56+++ src/platforms/ubuntu/ubuntucommon/window.cc 2013-12-20 04:46:44 +0000
57@@ -105,6 +105,7 @@
58 ua_ui_window_properties_set_titlen(wprops_, title.data(), title.size());
59 ua_ui_window_properties_set_role(wprops_, static_cast<UAUiWindowRole>(role));
60 ua_ui_window_properties_set_input_cb_and_ctx(wprops_, &eventCallback, this);
61+ ua_ui_window_properties_set_dimensions(wprops_, geometry.width(), geometry.height());
62
63 // Create platform window
64 window_ = ua_ui_window_new_for_application_with_properties(uainstance_, wprops_);

Subscribers

People subscribed via source and target branches