Merge lp:~azzar1/compiz/invisible-borders-titlebar into lp:compiz/0.9.10

Proposed by Andrea Azzarone on 2013-06-04
Status: Merged
Approved by: Andrea Azzarone on 2013-06-05
Approved revision: 3734
Merged at revision: 3735
Proposed branch: lp:~azzar1/compiz/invisible-borders-titlebar
Merge into: lp:compiz/0.9.10
Diff against target: 107 lines (+20/-1)
1 file modified
gtk/window-decorator/metacity.c (+20/-1)
To merge this branch: bzr merge lp:~azzar1/compiz/invisible-borders-titlebar
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2013-06-05
Christopher Townsend Approve on 2013-06-04
Sam Spilsbury 2013-06-04 Approve on 2013-06-04
Review via email: mp+167290@code.launchpad.net

Commit message

Extends invisible borders to the title bar too.

(LP: #717444)

Description of the change

== Problem ==
#717444 Window management - Invisible border does not extend to the top of the window

== Fix ==
Extend invisible border to the top of the window too. Not sure why it was disabled before, but seems to work fine now.

To post a comment you must log in.
Sam Spilsbury (smspillaz) wrote :

I had been meaning to get around to this for a while, thanks for that!

review: Approve
Sam Spilsbury (smspillaz) wrote :

Oops, looks like a test got broken on upgrade to saucy. I'll get a fix in for that now.

Christopher Townsend (townsend) wrote :

LGTM, so approving as well.

The CI looks suspicious, but I doubt it's related to this MP.

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Sam Spilsbury (smspillaz) wrote :

(Note: autolanding and CI will keep failing until that fix is merged in, sorry about that).

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk/window-decorator/metacity.c'
2--- gtk/window-decorator/metacity.c 2013-05-13 15:39:25 +0000
3+++ gtk/window-decorator/metacity.c 2013-06-04 14:21:49 +0000
4@@ -74,7 +74,9 @@
5 if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
6 {
7 frame_win_extents.bottom += mutter_draggable_border_width;
8+ frame_win_extents.top += mutter_draggable_border_width;
9 frame_max_win_extents.bottom += mutter_draggable_border_width;
10+ frame_max_win_extents.top += mutter_draggable_border_width;
11 }
12 }
13
14@@ -1106,11 +1108,17 @@
15 *x += d->frame->win_extents.left + 4;
16 *y += d->frame->win_extents.top + 2;
17 }
18- else if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
19+
20+ if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
21 {
22 *x += mutter_draggable_border_width;
23 }
24
25+ if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
26+ {
27+ *y += mutter_draggable_border_width;
28+ }
29+
30 return TRUE;
31 }
32
33@@ -1305,6 +1313,7 @@
34 if (!d->frame_window)
35 {
36 *x += mutter_draggable_border_width;
37+ *y += mutter_draggable_border_width;
38 *w += mutter_draggable_border_width;
39 *h += mutter_draggable_border_width;
40 }
41@@ -1322,6 +1331,7 @@
42 if (!d->frame_window)
43 {
44 *x -= mutter_draggable_border_width;
45+ *y += mutter_draggable_border_width;
46 *h += mutter_draggable_border_width;
47 *w += mutter_draggable_border_width * 2;
48 }
49@@ -1341,6 +1351,7 @@
50
51 if (!d->frame_window)
52 {
53+ *y += mutter_draggable_border_width;
54 *w += mutter_draggable_border_width;
55 *h += mutter_draggable_border_width;
56 }
57@@ -1362,6 +1373,7 @@
58 if (!d->frame_window)
59 {
60 *x += mutter_draggable_border_width;
61+ *y += mutter_draggable_border_width;
62 *w += mutter_draggable_border_width;
63 *h += mutter_draggable_border_width;
64 }
65@@ -1377,6 +1389,7 @@
66 if (!d->frame_window)
67 {
68 *x += mutter_draggable_border_width;
69+ *y += mutter_draggable_border_width;
70 }
71
72 break;
73@@ -1392,6 +1405,7 @@
74
75 if (!d->frame_window)
76 {
77+ *y += mutter_draggable_border_width;
78 *h += mutter_draggable_border_width;
79 *w += mutter_draggable_border_width;
80 }
81@@ -1418,6 +1432,7 @@
82 {
83 *x += mutter_draggable_border_width;
84 *w += mutter_draggable_border_width;
85+ *h += mutter_draggable_border_width;
86 }
87 break;
88 case 1: /* top */
89@@ -1433,6 +1448,7 @@
90 {
91 *x -= mutter_draggable_border_width;
92 *w += mutter_draggable_border_width * 2;
93+ *h += mutter_draggable_border_width;
94 }
95
96 break;
97@@ -1449,7 +1465,10 @@
98 *h = fgeom.top_height + RESIZE_EXTENDS;
99
100 if (!d->frame_window)
101+ {
102 *w += mutter_draggable_border_width;
103+ *h += mutter_draggable_border_width;
104+ }
105
106 break;
107 }

Subscribers

People subscribed via source and target branches