Files

Merge lp:~jeremywootten/pantheon-files/fix-click-zone-identification-in-treeview into lp:~elementary-apps/pantheon-files/trunk

  1. fix-click-zone-identification-in-treeview
  2. Merge into trunk
Proposed by Jeremy Wootten
Status: Merged
Approved by: Cody Garver
Approved revision: 1816
Merged at revision: 1821
Proposed branch: lp:~jeremywootten/pantheon-files/fix-click-zone-identification-in-treeview
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 13 lines (+2/-2)
1 file modified
src/View/AbstractTreeView.vala (+2/-2)
To merge this branch: bzr merge lp:~jeremywootten/pantheon-files/fix-click-zone-identification-in-treeview
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+259331@code.launchpad.net

Commit message

Calculate more accurately when on icon in list and column views (lp:1455960)

Description of the change

This branch fixes a bug where the position of the icon in the list and column views is miscalculated, particularly at high levels of indentation. This results in, inter alia, parts of the icon being undraggable.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/View/AbstractTreeView.vala'
2--- src/View/AbstractTreeView.vala 2015-04-18 12:10:52 +0000
3+++ src/View/AbstractTreeView.vala 2015-05-17 18:33:38 +0000
4@@ -201,8 +201,8 @@
5 if (tree.show_expanders) {
6 var expander_val = GLib.Value (typeof (int));
7 tree.style_get_property ("expander-size", ref expander_val);
8- int expander_size = expander_val.get_int () + tree.get_level_indentation ();
9- expander_width += expander_size * (depth +1);
10+ int expander_size = expander_val.get_int () + tree.get_level_indentation () + 3;
11+ expander_width += expander_size * (depth) + zoom_level;
12 }
13 int orig_x = expander_width + x_offset;
14

Subscribers

People subscribed via source and target branches

to all changes: