Merge lp://staging/~mterry/notify-osd/no-border into lp://staging/~canonical-dx-team/notify-osd/precise

Proposed by Michael Terry
Status: Merged
Approved by: Allan LeSage
Approved revision: 457
Merged at revision: 457
Proposed branch: lp://staging/~mterry/notify-osd/no-border
Merge into: lp://staging/~canonical-dx-team/notify-osd/precise
Diff against target: 770 lines (+212/-178)
5 files modified
src/bubble.c (+162/-138)
src/defaults.c (+23/-22)
src/defaults.h (+4/-3)
src/display.c (+13/-10)
src/stack.c (+10/-5)
To merge this branch: bzr merge lp://staging/~mterry/notify-osd/no-border
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Didier Roche-Tolomelli Approve
jenkins (community) continuous-integration Approve
Mirco Müller Pending
Review via email: mp+121956@code.staging.launchpad.net

Description of the change

When running without a compositor, there is an ugly black border.

This branch fixes that by:
1) Adding an 'is_composited' argument to defaults_get_bubble_shadow_size and defaults_get_bubble_corner_radius. If we're not composited, they return 0.0f.
2) Adding a 'GdkScreen **screen' argument to defaults_get_top_corner
3) Using these throughout to check composited state wherever these are used.

Additionally, I had to add some oddness in bubble.c for _refresh_background. There is a bit of code that draws a (seemingly unnecessary) image in shadow-size-units even in the uncomposited case. But it can't use 0 because that causes a crash to create a 0-sized image. So I used 1 for that special case. Seems like it would be cleaner to avoid that path in uncomposited mode, but I didn't feel confident enough to make that change.

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :
review: Approve (continuous-integration)
Revision history for this message
Omer Akram (om26er) wrote :

This fix is worth having in Quantal for a better user experience. Since now notfy-osd appears at the login screen where no compositor is running so this problem becomes more visible than it used to be.

Revision history for this message
Michael Terry (mterry) wrote :

I already patched this into quantal, so no worries from a timing perspective.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

was never approved and it's in ubuntu for a while, approving.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Will kick off this job again--caught in-between landing inline packaging.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Apologies; will *approve* and thereby kick off again.

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.

Subscribers

People subscribed via source and target branches