Salience

Merge lp:~christhehorton/salience/maximized_metacity_changes into lp:salience

  1. maximized_metacity_changes
  2. Merge into trunk
Proposed by Christopher Kyle Horton
Status: Needs review
Proposed branch: lp:~christhehorton/salience/maximized_metacity_changes
Merge into: lp:salience
Diff against target: 179 lines (+37/-12)
2 files modified
metacity-1/metacity-theme-2.xml (+20/-4)
metacity-1/metacity-theme-3.xml (+17/-8)
To merge this branch: bzr merge lp:~christhehorton/salience/maximized_metacity_changes
Reviewer Review Type Date Requested Status
Salience Team Pending
Review via email: mp+136825@code.launchpad.net

Description of the change

Alters the Metacity theming for maximized windows so that they blend into the top panel in GNOME Classic, similar to how they do in Unity. This is a change intended to improve theme consistency across desktop shells. Intended to fix Bug #1084321.

To post a comment you must log in.

Unmerged revisions

172. By Christopher Kyle Horton

Tweak the groove colors a little bit.

171. By Christopher Kyle Horton

Add a groove between the top GNOME Classic panel and the rest of the maximized window, similar to what is already being used at the top of toolbars.

170. By Christopher Kyle Horton

Make maximized windows' titlebars blend into the top of GNOME Panel.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'metacity-1/metacity-theme-2.xml'
2--- metacity-1/metacity-theme-2.xml 2012-10-14 17:25:59 +0000
3+++ metacity-1/metacity-theme-2.xml 2012-11-29 01:11:19 +0000
4@@ -128,6 +128,11 @@
5 </gradient>
6 </draw_ops>
7
8+<draw_ops name="titlebar_fill_focused_max">
9+ <line color="shade/gtk:bg[NORMAL]/0.80" x1="0" y1="0" x2="width" y2="0" />
10+ <line color="shade/gtk:bg[NORMAL]/1.40" x1="0" y1="1" x2="width" y2="1" />
11+</draw_ops>
12+
13 <draw_ops name="titlebar_fill_focused_alt">
14 <gradient type="vertical" x="0" y="0" width="width" height="height">
15 <color value="shade/gtk:bg[NORMAL]/1.40"/>
16@@ -137,6 +142,10 @@
17 </gradient>
18 </draw_ops>
19
20+<draw_ops name="titlebar_fill_focused_max_alt">
21+ <include name="titlebar_fill_focused_max" />
22+</draw_ops>
23+
24 <draw_ops name="titlebar_fill_unfocused">
25 <gradient type="vertical" x="0" y="0" width="width" height="height">
26 <color value="shade/gtk:bg[NORMAL]/1.40"/>
27@@ -146,10 +155,17 @@
28 </gradient>
29 </draw_ops>
30
31+<draw_ops name="titlebar_fill_unfocused_max">
32+</draw_ops>
33+
34 <draw_ops name="titlebar_unfocused">
35 <include name="titlebar_fill_unfocused" />
36 </draw_ops>
37
38+<draw_ops name="titlebar_unfocused_max">
39+ <include name="titlebar_fill_unfocused_max" />
40+</draw_ops>
41+
42 <draw_ops name="hilight">
43 <line x1="1" y1="1" x2="width-2" y2="1" color="C_titlebar_focused_hilight" />
44 <gradient type="vertical" x="1" y="1" width="1" height="height-4">
45@@ -427,7 +443,7 @@
46
47 <frame_style name="normal_max_focused" geometry="max">
48 <piece position="entire_background" draw_ops="entire_background_focused" />
49- <piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
50+ <piece position="titlebar" draw_ops="titlebar_fill_focused_max_alt" />
51 <piece position="title" draw_ops="title_focused" />
52 <button function="close" state="normal" draw_ops="close_focused" />
53 <button function="close" state="prelight" draw_ops="close_focused_prelight" />
54@@ -467,7 +483,7 @@
55
56 <frame_style name="normal_max_unfocused" geometry="max">
57 <piece position="entire_background" draw_ops="entire_background_unfocused" />
58- <piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
59+ <piece position="titlebar" draw_ops="titlebar_fill_unfocused_max" />
60 <piece position="title" draw_ops="title_unfocused" />
61 <button function="close" state="normal" draw_ops="close_unfocused"/>
62 <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
63@@ -507,7 +523,7 @@
64
65 <frame_style name="normal_max_shaded_focused" geometry="max">
66 <piece position="entire_background" draw_ops="entire_background_focused" />
67- <piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
68+ <piece position="titlebar" draw_ops="titlebar_fill_focused_max_alt" />
69 <piece position="title" draw_ops="title_focused" />
70 <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
71 <button function="close" state="normal" draw_ops="close_focused" />
72@@ -548,7 +564,7 @@
73
74 <frame_style name="normal_max_shaded_unfocused" geometry="max">
75 <piece position="entire_background" draw_ops="entire_background_unfocused" />
76- <piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
77+ <piece position="titlebar" draw_ops="titlebar_fill_unfocused_max" />
78 <piece position="title" draw_ops="title_unfocused" />
79 <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
80 <button function="close" state="normal" draw_ops="close_unfocused"/>
81
82=== modified file 'metacity-1/metacity-theme-3.xml'
83--- metacity-1/metacity-theme-3.xml 2012-10-14 17:25:59 +0000
84+++ metacity-1/metacity-theme-3.xml 2012-11-29 01:11:19 +0000
85@@ -168,6 +168,11 @@
86 </gradient>
87 </draw_ops>
88
89+<draw_ops name="titlebar_fill_focused_max">
90+ <line x1="0" y1="0" x2="width" y2="0" color="shade/gtk:bg[NORMAL]/0.80" />
91+ <line x1="0" y1="1" x2="width" y2="1" color="shade/gtk:bg[NORMAL]/1.40" />
92+</draw_ops>
93+
94
95 <draw_ops name="titlebar_fill_attached_focused"> <!-- gradient for attached and modal dialogs titlebar-->
96 <gradient type="vertical" x="0" y="0" width="width" height="height">
97@@ -187,6 +192,10 @@
98 </gradient>
99 </draw_ops>
100
101+<draw_ops name="titlebar_fill_unfocused_max">
102+ <include name="titlebar_fill_focused_max" />
103+</draw_ops>
104+
105 <draw_ops name="hilight">
106 <line x1="1" y1="1" x2="width-2" y2="1" color="C_titlebar_focused_hilight" />
107 <gradient type="vertical" x="1" y="1" width="1" height="height-4">
108@@ -508,7 +517,7 @@
109
110 <frame_style name="normal_max_focused" geometry="max">
111 <piece position="entire_background" draw_ops="entire_background_focused" />
112- <piece position="titlebar" draw_ops="titlebar_fill_focused" />
113+ <piece position="titlebar" draw_ops="titlebar_fill_focused_max" />
114 <piece position="title" draw_ops="title_focused" />
115 <button function="close" state="normal" draw_ops="close_focused" />
116 <button function="close" state="prelight" draw_ops="close_focused_prelight" />
117@@ -551,7 +560,7 @@
118
119 <frame_style name="normal_max_unfocused" geometry="max">
120 <piece position="entire_background" draw_ops="entire_background_unfocused" />
121- <piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
122+ <piece position="titlebar" draw_ops="titlebar_fill_unfocused_max" />
123 <piece position="title" draw_ops="title_unfocused" />
124 <button function="close" state="normal" draw_ops="close_unfocused"/>
125 <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
126@@ -594,7 +603,7 @@
127
128 <frame_style name="normal_max_shaded_focused" geometry="max">
129 <piece position="entire_background" draw_ops="entire_background_focused" />
130- <piece position="titlebar" draw_ops="titlebar_fill_focused" />
131+ <piece position="titlebar" draw_ops="titlebar_fill_focused_max" />
132 <piece position="title" draw_ops="title_focused" />
133 <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
134 <button function="close" state="normal" draw_ops="close_focused" />
135@@ -638,7 +647,7 @@
136
137 <frame_style name="normal_max_shaded_unfocused" geometry="max">
138 <piece position="entire_background" draw_ops="entire_background_unfocused" />
139- <piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
140+ <piece position="titlebar" draw_ops="titlebar_fill_unfocused_max" />
141 <piece position="title" draw_ops="title_unfocused" />
142 <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
143 <button function="close" state="normal" draw_ops="close_unfocused"/>
144@@ -1004,7 +1013,7 @@
145
146 <frame_style name="tiled_left_focused" geometry="tiled_left">
147 <piece position="entire_background" draw_ops="entire_background_focused" />
148- <piece position="titlebar" draw_ops="titlebar_fill_focused" />
149+ <piece position="titlebar" draw_ops="titlebar_fill_focused_max" />
150 <piece position="title" draw_ops="title_focused" />
151 <piece position="overlay" draw_ops="border_right_focused" />
152 <button function="close" state="normal" draw_ops="close_focused" />
153@@ -1037,7 +1046,7 @@
154
155 <frame_style name="tiled_left_unfocused" geometry="tiled_left">
156 <piece position="entire_background" draw_ops="entire_background_unfocused" />
157- <piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
158+ <piece position="titlebar" draw_ops="titlebar_fill_unfocused_max" />
159 <piece position="title" draw_ops="title_unfocused" />
160 <piece position="overlay" draw_ops="border_right_unfocused" />
161 <button function="close" state="normal" draw_ops="close_unfocused"/>
162@@ -1070,7 +1079,7 @@
163
164 <frame_style name="tiled_right_focused" geometry="tiled_right">
165 <piece position="entire_background" draw_ops="entire_background_focused" />
166- <piece position="titlebar" draw_ops="titlebar_fill_focused" />
167+ <piece position="titlebar" draw_ops="titlebar_fill_focused_max" />
168 <piece position="title" draw_ops="title_focused" />
169 <piece position="overlay" draw_ops="border_left_focused" />
170 <button function="close" state="normal" draw_ops="close_focused" />
171@@ -1103,7 +1112,7 @@
172
173 <frame_style name="tiled_right_unfocused" geometry="tiled_right">
174 <piece position="entire_background" draw_ops="entire_background_unfocused" />
175- <piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
176+ <piece position="titlebar" draw_ops="titlebar_fill_unfocused_max" />
177 <piece position="title" draw_ops="title_unfocused" />
178 <piece position="overlay" draw_ops="border_left_unfocused" />
179 <button function="close" state="normal" draw_ops="close_unfocused"/>

Subscribers

People subscribed via source and target branches