python-upa

Merge lp:~mzanetti/python-ubuntu-platform-api/fix-resolutions into lp:python-ubuntu-platform-api

  1. fix-resolutions
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Merged
Approved by: Michał Sawicz
Approved revision: 19
Merged at revision: 19
Proposed branch: lp:~mzanetti/python-ubuntu-platform-api/fix-resolutions
Merge into: lp:python-ubuntu-platform-api
Diff against target: 21 lines (+4/-4)
1 file modified
upa/_mir.cpp (+4/-4)
To merge this branch: bzr merge lp:~mzanetti/python-ubuntu-platform-api/fix-resolutions
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+189320@code.launchpad.net

Commit message

fix screen sizes for devices other than mako

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'upa/_mir.cpp'
2--- upa/_mir.cpp 2013-10-03 23:13:50 +0000
3+++ upa/_mir.cpp 2013-10-04 13:55:27 +0000
4@@ -48,14 +48,14 @@
5 if (strcmp(device, "mako\n") == 0) {
6 res_x = 768;
7 res_y = 1280;
8+ } else if (strcmp(device, "maguro\n") == 0) {
9+ res_x = 720;
10+ res_y = 1280;
11 } else if (strcmp(device, "manta\n") == 0) {
12- res_x = 720;
13- res_y = 1200;
14- } else if (strcmp(device, "maguro\n") == 0) {
15 res_x = 2560;
16 res_y = 1600;
17 } else if (strcmp(device, "grouper\n") == 0) {
18- res_x = 768;
19+ res_x = 800;
20 res_y = 1280;
21 }
22

Subscribers

People subscribed via source and target branches