Nux

Merge lp:~bregma/nux/lp-1379960 into lp:nux

  1. lp-1379960
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: 859
Merged at revision: 862
Proposed branch: lp:~bregma/nux/lp-1379960
Merge into: lp:nux
Diff against target: 34 lines (+3/-3)
2 files modified
NuxGraphics/GraphicsDisplayX11.cpp (+2/-2)
NuxGraphics/GraphicsDisplayX11.h (+1/-1)
To merge this branch: bzr merge lp:~bregma/nux/lp-1379960
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+260004@code.launchpad.net

Commit message

fix the size of timeout values on 64-bit platforms (thanks Simon Arlott)

Description of the change

Fixes the size of timeout values on 64-bit platforms.

THIS IS AN ABI-BREAKING CHANGE.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:859
http://jenkins.qa.ubuntu.com/job/nux-ci/119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-wily-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-wily-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nux-ci/119/rebuild

review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Yep, good sleuthing by Simon! Too bad this is an ABI break as it will make SRUing into Trusty quite difficult:(

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
2--- NuxGraphics/GraphicsDisplayX11.cpp 2014-07-14 17:14:48 +0000
3+++ NuxGraphics/GraphicsDisplayX11.cpp 2015-05-23 02:22:22 +0000
4@@ -39,7 +39,7 @@
5
6 namespace nux
7 {
8- int GraphicsDisplay::double_click_time_delay = 400; // milliseconds
9+ Time GraphicsDisplay::double_click_time_delay = 400; // milliseconds
10
11 namespace atom
12 {
13@@ -1129,7 +1129,7 @@
14
15 bool double_click = false;
16 Time current_time = xevent.xbutton.time;
17- if ((double_click_counter_ == 1) && ((int)current_time - (int)last_click_time_ < double_click_time_delay))
18+ if ((double_click_counter_ == 1) && (current_time - last_click_time_ < double_click_time_delay))
19 {
20 double_click = true;
21 double_click_counter_ = 0;
22
23=== modified file 'NuxGraphics/GraphicsDisplayX11.h'
24--- NuxGraphics/GraphicsDisplayX11.h 2013-12-18 21:43:30 +0000
25+++ NuxGraphics/GraphicsDisplayX11.h 2015-05-23 02:22:22 +0000
26@@ -143,7 +143,7 @@
27 Maximum time allowed between the end of the last click (mouse up) and the next mouse down
28 to be considered as a double click event.
29 */
30- static int double_click_time_delay;
31+ static Time double_click_time_delay;
32 int double_click_counter_;
33
34 public:

Subscribers

People subscribed via source and target branches