Unity

Merge lp://staging/~brandontschaefer/unity/lp.834465-fix-ABI-BREAK-FIX into lp://staging/unity

  1. lp.834465-fix-ABI-BREAK-FIX
  2. Merge into trunk
Proposed by Brandon Schaefer
Status: Needs review
Proposed branch: lp://staging/~brandontschaefer/unity/lp.834465-fix-ABI-BREAK-FIX
Merge into: lp://staging/unity
Diff against target: 97 lines (+23/-3)
4 files modified
unity-shared/SearchBar.cpp (+7/-0)
unity-shared/SearchBar.h (+1/-0)
unity-shared/UnitySettings.cpp (+14/-3)
unity-shared/UnitySettings.h (+1/-0)
To merge this branch: bzr merge lp://staging/~brandontschaefer/unity/lp.834465-fix-ABI-BREAK-FIX
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Marco Trevisan (Treviño) Needs Fixing
Review via email: mp+258323@code.staging.launchpad.net

Commit message

Update the search bar cursor blinking speed based on the GNOME cursor blink speed setting.

Description of the change

Update the search bar cursor blinking speed based on the GNOME cursor blink speed setting.

This fixes the ABI break caused by this branch:
https://code.launchpad.net/~brandontschaefer/nux/lp.834465-fix-ABI-BREAK/+merge/258321

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

FAILED: Continuous integration, rev:3955
http://jenkins.qa.ubuntu.com/job/unity-ci/1221/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/109/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/111/console

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

I think you should do this inside IMTextEntry instead since it's the lower level class that we share between all the the text fields (not only the search bar, but also the spread filter and lockscreen inputs).

At this point, I think you can avoid to put this inside UnitySettings at all, since I don't think we need to use this setting everywhere else, so I'd just modify that class.

review: Needs Fixing
Reply
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Ah, also... Since we're there, read the bool setting "cursor-blink", and if it's false we've not to blink at all.

So, in this case we might pass to nux a 0 (or -1) blinking time (and make nux to create no timeout at all in that case).

Reply
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Good idea about the cursor blink and false.

The only reason I put it in UnitySettings was because the gnome_settings_ui was already set up and the signals were already set up. Though I can re-do those bit else where so we dont expose the blink cursor speed.

Reply
lp://staging/~brandontschaefer/unity/lp.834465-fix-ABI-BREAK-FIX updated
3956. By Brandon Schaefer

* Do the ABI Fix in a different branch

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3956
http://jenkins.qa.ubuntu.com/job/unity-ci/1233/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/9/console

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

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

3956. By Brandon Schaefer

* Do the ABI Fix in a different branch

3955. By Brandon Schaefer

* Use the GNOME cursor blink speed for the TextEntry used in the all the SearchBars

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.