Merge lp://qastaging/~jeremywootten/pantheon-files/fix-focus-clipping-in-icon-view into lp://qastaging/~elementary-apps/pantheon-files/trunk

Proposed by Jeremy Wootten
Status: Merged
Approved by: Danielle Foré
Approved revision: 2474
Merged at revision: 2581
Proposed branch: lp://qastaging/~jeremywootten/pantheon-files/fix-focus-clipping-in-icon-view
Merge into: lp://qastaging/~elementary-apps/pantheon-files/trunk
Diff against target: 280 lines (+106/-63)
3 files modified
src/TextRenderer.vala (+97/-55)
src/View/AbstractDirectoryView.vala (+0/-1)
src/View/IconView.vala (+9/-7)
To merge this branch: bzr merge lp://qastaging/~jeremywootten/pantheon-files/fix-focus-clipping-in-icon-view
Reviewer Review Type Date Requested Status
Zisu Andrei (community) Approve
Danielle Foré Abstain
Review via email: mp+316409@code.qastaging.launchpad.net

Commit message

fixes visual glitches in the text rendering:
* clipping of the focus rectangle in icon view
* Incorrect alignment in ListView with RTL language
* Reduce excess vertical spacing of icons with short names

Description of the change

This branch builds on lp:~jeremywootten/pantheon-files/fix-1658417-long-name-in-grid-view, (now merged).

It fixes some visual glitches in the text rendering:

1) clipping of the focus/color rectangle in icon view at some zoom levels/name lengths.
2) Incorrect alignment in ListView with RTL language

It also reduces the excess vertical spacing of icons with short names.

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

Looks like this branch has merge conflicts

review: Needs Fixing
2467. By Jeremy Wootten

Merge trunk to r 2556 and resolve conflicts

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

Trunk merged to r2556 and conflicts resolved.

2468. By Jeremy Wootten

Merge trunk to r2563

2469. By Jeremy Wootten

Ensure no clipping, improve centering with LTR and RTL

Revision history for this message
Dieter Debast (ddieter) wrote :

Issue #1405853 also says that clicking on the whitespace (when the file is highlighted) doesn't select the file/folder, but this isn't fixed in this branch (maybe this can be put into a separate issue?). Dragging a selection box over this whitespace does seem to work.

Revision history for this message
Danielle Foré (danrabbit) wrote :

Changing my review to "abstain" so that it doesn't appear to need fixing on my account

review: Abstain
Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

Dieter: I have removed the second, unconnected issue from #1405853 and asked the reported to refile that as a separate bug. So this branch is only intended to fix the excess whitespace and clipping issues.

Revision history for this message
Zisu Andrei (matzipan) wrote :

Some feedback. I confirm it fixes the rounded corners issue. And I confirm there is a reduction of the "excess spacing"

review: Needs Fixing
Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

See replies to inline comments. Will address the code style issues.

2470. By Jeremy Wootten

Uncapitalize BORDER_RADIUS

2471. By Jeremy Wootten

Insert missing brackets

2472. By Jeremy Wootten

Remove superfluous brackets

2473. By Jeremy Wootten

Merge trunk to r2578

Revision history for this message
Zisu Andrei (matzipan) wrote :

As discussed on slack, perhaps the line below should be a comment in the code, to clarify:
> To ensure the focus_rect is at least one pixel smaller than cell_area on each side. Helps prevent clipping.

Other than that. LGTM.

review: Approve
2474. By Jeremy Wootten

Add comment

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

to all changes: