Merge lp:~victored/granite/lp-1302314 into lp:~elementary-pantheon/granite/granite

Proposed by Victor Martinez
Status: Merged
Approved by: Corentin Noël
Approved revision: 710
Merged at revision: 711
Proposed branch: lp:~victored/granite/lp-1302314
Merge into: lp:~elementary-pantheon/granite/granite
Diff against target: 22 lines (+8/-3)
1 file modified
lib/Widgets/ThinPaned.vala (+8/-3)
To merge this branch: bzr merge lp:~victored/granite/lp-1302314
Reviewer Review Type Date Requested Status
Corentin Noël Approve
Review via email: mp+214151@code.launchpad.net

Commit message

ThinPaned: make sure the handle follows the cursor position when using client-side decorations. Fixes lp:1302314

Description of the change

This branch makes the ThinPaned's handle follow the cursor position when using client-side decorations. Fixes lp:1302314

To post a comment you must log in.
Revision history for this message
Corentin Noël (tintou) wrote :

This indeed fixed the bug, everything is okay, nice fix!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/Widgets/ThinPaned.vala'
2--- lib/Widgets/ThinPaned.vala 2013-05-14 13:44:42 +0000
3+++ lib/Widgets/ThinPaned.vala 2014-04-04 03:50:10 +0000
4@@ -239,10 +239,15 @@
5
6 get_window ().get_device_position (device, out x, out y, null);
7
8- if (orientation == Gtk.Orientation.HORIZONTAL)
9+ Gtk.Allocation allocation;
10+ get_allocation (out allocation);
11+
12+ if (orientation == Gtk.Orientation.HORIZONTAL) {
13+ x -= allocation.x;
14 pos = Utils.is_left_to_right (this) ? x : get_allocated_width () - x;
15- else
16- pos = y;
17+ } else {
18+ pos = y - allocation.y;
19+ }
20
21 position = pos.clamp (min_position, max_position);
22 return true;

Subscribers

People subscribed via source and target branches