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
=== modified file 'metacity-1/metacity-theme-2.xml'
--- metacity-1/metacity-theme-2.xml 2012-10-14 17:25:59 +0000
+++ metacity-1/metacity-theme-2.xml 2012-11-29 01:11:19 +0000
@@ -128,6 +128,11 @@
128 </gradient>128 </gradient>
129</draw_ops>129</draw_ops>
130130
131<draw_ops name="titlebar_fill_focused_max">
132 <line color="shade/gtk:bg[NORMAL]/0.80" x1="0" y1="0" x2="width" y2="0" />
133 <line color="shade/gtk:bg[NORMAL]/1.40" x1="0" y1="1" x2="width" y2="1" />
134</draw_ops>
135
131<draw_ops name="titlebar_fill_focused_alt">136<draw_ops name="titlebar_fill_focused_alt">
132 <gradient type="vertical" x="0" y="0" width="width" height="height">137 <gradient type="vertical" x="0" y="0" width="width" height="height">
133 <color value="shade/gtk:bg[NORMAL]/1.40"/>138 <color value="shade/gtk:bg[NORMAL]/1.40"/>
@@ -137,6 +142,10 @@
137 </gradient>142 </gradient>
138</draw_ops>143</draw_ops>
139144
145<draw_ops name="titlebar_fill_focused_max_alt">
146 <include name="titlebar_fill_focused_max" />
147</draw_ops>
148
140<draw_ops name="titlebar_fill_unfocused">149<draw_ops name="titlebar_fill_unfocused">
141 <gradient type="vertical" x="0" y="0" width="width" height="height">150 <gradient type="vertical" x="0" y="0" width="width" height="height">
142 <color value="shade/gtk:bg[NORMAL]/1.40"/>151 <color value="shade/gtk:bg[NORMAL]/1.40"/>
@@ -146,10 +155,17 @@
146 </gradient>155 </gradient>
147</draw_ops>156</draw_ops>
148157
158<draw_ops name="titlebar_fill_unfocused_max">
159</draw_ops>
160
149<draw_ops name="titlebar_unfocused">161<draw_ops name="titlebar_unfocused">
150 <include name="titlebar_fill_unfocused" />162 <include name="titlebar_fill_unfocused" />
151</draw_ops>163</draw_ops>
152164
165<draw_ops name="titlebar_unfocused_max">
166 <include name="titlebar_fill_unfocused_max" />
167</draw_ops>
168
153<draw_ops name="hilight">169<draw_ops name="hilight">
154 <line x1="1" y1="1" x2="width-2" y2="1" color="C_titlebar_focused_hilight" />170 <line x1="1" y1="1" x2="width-2" y2="1" color="C_titlebar_focused_hilight" />
155 <gradient type="vertical" x="1" y="1" width="1" height="height-4">171 <gradient type="vertical" x="1" y="1" width="1" height="height-4">
@@ -427,7 +443,7 @@
427443
428<frame_style name="normal_max_focused" geometry="max">444<frame_style name="normal_max_focused" geometry="max">
429 <piece position="entire_background" draw_ops="entire_background_focused" />445 <piece position="entire_background" draw_ops="entire_background_focused" />
430 <piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />446 <piece position="titlebar" draw_ops="titlebar_fill_focused_max_alt" />
431 <piece position="title" draw_ops="title_focused" />447 <piece position="title" draw_ops="title_focused" />
432 <button function="close" state="normal" draw_ops="close_focused" />448 <button function="close" state="normal" draw_ops="close_focused" />
433 <button function="close" state="prelight" draw_ops="close_focused_prelight" />449 <button function="close" state="prelight" draw_ops="close_focused_prelight" />
@@ -467,7 +483,7 @@
467483
468<frame_style name="normal_max_unfocused" geometry="max">484<frame_style name="normal_max_unfocused" geometry="max">
469 <piece position="entire_background" draw_ops="entire_background_unfocused" />485 <piece position="entire_background" draw_ops="entire_background_unfocused" />
470 <piece position="titlebar" draw_ops="titlebar_fill_unfocused" />486 <piece position="titlebar" draw_ops="titlebar_fill_unfocused_max" />
471 <piece position="title" draw_ops="title_unfocused" />487 <piece position="title" draw_ops="title_unfocused" />
472 <button function="close" state="normal" draw_ops="close_unfocused"/>488 <button function="close" state="normal" draw_ops="close_unfocused"/>
473 <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>489 <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
@@ -507,7 +523,7 @@
507523
508<frame_style name="normal_max_shaded_focused" geometry="max">524<frame_style name="normal_max_shaded_focused" geometry="max">
509 <piece position="entire_background" draw_ops="entire_background_focused" />525 <piece position="entire_background" draw_ops="entire_background_focused" />
510 <piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />526 <piece position="titlebar" draw_ops="titlebar_fill_focused_max_alt" />
511 <piece position="title" draw_ops="title_focused" />527 <piece position="title" draw_ops="title_focused" />
512 <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>528 <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
513 <button function="close" state="normal" draw_ops="close_focused" />529 <button function="close" state="normal" draw_ops="close_focused" />
@@ -548,7 +564,7 @@
548564
549<frame_style name="normal_max_shaded_unfocused" geometry="max">565<frame_style name="normal_max_shaded_unfocused" geometry="max">
550 <piece position="entire_background" draw_ops="entire_background_unfocused" />566 <piece position="entire_background" draw_ops="entire_background_unfocused" />
551 <piece position="titlebar" draw_ops="titlebar_fill_unfocused" />567 <piece position="titlebar" draw_ops="titlebar_fill_unfocused_max" />
552 <piece position="title" draw_ops="title_unfocused" />568 <piece position="title" draw_ops="title_unfocused" />
553 <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>569 <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
554 <button function="close" state="normal" draw_ops="close_unfocused"/>570 <button function="close" state="normal" draw_ops="close_unfocused"/>
555571
=== modified file 'metacity-1/metacity-theme-3.xml'
--- metacity-1/metacity-theme-3.xml 2012-10-14 17:25:59 +0000
+++ metacity-1/metacity-theme-3.xml 2012-11-29 01:11:19 +0000
@@ -168,6 +168,11 @@
168 </gradient>168 </gradient>
169</draw_ops>169</draw_ops>
170170
171<draw_ops name="titlebar_fill_focused_max">
172 <line x1="0" y1="0" x2="width" y2="0" color="shade/gtk:bg[NORMAL]/0.80" />
173 <line x1="0" y1="1" x2="width" y2="1" color="shade/gtk:bg[NORMAL]/1.40" />
174</draw_ops>
175
171176
172<draw_ops name="titlebar_fill_attached_focused"> <!-- gradient for attached and modal dialogs titlebar-->177<draw_ops name="titlebar_fill_attached_focused"> <!-- gradient for attached and modal dialogs titlebar-->
173 <gradient type="vertical" x="0" y="0" width="width" height="height">178 <gradient type="vertical" x="0" y="0" width="width" height="height">
@@ -187,6 +192,10 @@
187 </gradient>192 </gradient>
188</draw_ops>193</draw_ops>
189194
195<draw_ops name="titlebar_fill_unfocused_max">
196 <include name="titlebar_fill_focused_max" />
197</draw_ops>
198
190<draw_ops name="hilight">199<draw_ops name="hilight">
191 <line x1="1" y1="1" x2="width-2" y2="1" color="C_titlebar_focused_hilight" />200 <line x1="1" y1="1" x2="width-2" y2="1" color="C_titlebar_focused_hilight" />
192 <gradient type="vertical" x="1" y="1" width="1" height="height-4">201 <gradient type="vertical" x="1" y="1" width="1" height="height-4">
@@ -508,7 +517,7 @@
508517
509<frame_style name="normal_max_focused" geometry="max">518<frame_style name="normal_max_focused" geometry="max">
510 <piece position="entire_background" draw_ops="entire_background_focused" />519 <piece position="entire_background" draw_ops="entire_background_focused" />
511 <piece position="titlebar" draw_ops="titlebar_fill_focused" />520 <piece position="titlebar" draw_ops="titlebar_fill_focused_max" />
512 <piece position="title" draw_ops="title_focused" />521 <piece position="title" draw_ops="title_focused" />
513 <button function="close" state="normal" draw_ops="close_focused" />522 <button function="close" state="normal" draw_ops="close_focused" />
514 <button function="close" state="prelight" draw_ops="close_focused_prelight" />523 <button function="close" state="prelight" draw_ops="close_focused_prelight" />
@@ -551,7 +560,7 @@
551560
552<frame_style name="normal_max_unfocused" geometry="max">561<frame_style name="normal_max_unfocused" geometry="max">
553 <piece position="entire_background" draw_ops="entire_background_unfocused" />562 <piece position="entire_background" draw_ops="entire_background_unfocused" />
554 <piece position="titlebar" draw_ops="titlebar_fill_unfocused" />563 <piece position="titlebar" draw_ops="titlebar_fill_unfocused_max" />
555 <piece position="title" draw_ops="title_unfocused" />564 <piece position="title" draw_ops="title_unfocused" />
556 <button function="close" state="normal" draw_ops="close_unfocused"/>565 <button function="close" state="normal" draw_ops="close_unfocused"/>
557 <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>566 <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
@@ -594,7 +603,7 @@
594603
595<frame_style name="normal_max_shaded_focused" geometry="max">604<frame_style name="normal_max_shaded_focused" geometry="max">
596 <piece position="entire_background" draw_ops="entire_background_focused" />605 <piece position="entire_background" draw_ops="entire_background_focused" />
597 <piece position="titlebar" draw_ops="titlebar_fill_focused" />606 <piece position="titlebar" draw_ops="titlebar_fill_focused_max" />
598 <piece position="title" draw_ops="title_focused" />607 <piece position="title" draw_ops="title_focused" />
599 <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>608 <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
600 <button function="close" state="normal" draw_ops="close_focused" />609 <button function="close" state="normal" draw_ops="close_focused" />
@@ -638,7 +647,7 @@
638647
639<frame_style name="normal_max_shaded_unfocused" geometry="max">648<frame_style name="normal_max_shaded_unfocused" geometry="max">
640 <piece position="entire_background" draw_ops="entire_background_unfocused" />649 <piece position="entire_background" draw_ops="entire_background_unfocused" />
641 <piece position="titlebar" draw_ops="titlebar_fill_unfocused" />650 <piece position="titlebar" draw_ops="titlebar_fill_unfocused_max" />
642 <piece position="title" draw_ops="title_unfocused" />651 <piece position="title" draw_ops="title_unfocused" />
643 <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>652 <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
644 <button function="close" state="normal" draw_ops="close_unfocused"/>653 <button function="close" state="normal" draw_ops="close_unfocused"/>
@@ -1004,7 +1013,7 @@
10041013
1005<frame_style name="tiled_left_focused" geometry="tiled_left">1014<frame_style name="tiled_left_focused" geometry="tiled_left">
1006 <piece position="entire_background" draw_ops="entire_background_focused" />1015 <piece position="entire_background" draw_ops="entire_background_focused" />
1007 <piece position="titlebar" draw_ops="titlebar_fill_focused" />1016 <piece position="titlebar" draw_ops="titlebar_fill_focused_max" />
1008 <piece position="title" draw_ops="title_focused" />1017 <piece position="title" draw_ops="title_focused" />
1009 <piece position="overlay" draw_ops="border_right_focused" />1018 <piece position="overlay" draw_ops="border_right_focused" />
1010 <button function="close" state="normal" draw_ops="close_focused" />1019 <button function="close" state="normal" draw_ops="close_focused" />
@@ -1037,7 +1046,7 @@
10371046
1038<frame_style name="tiled_left_unfocused" geometry="tiled_left">1047<frame_style name="tiled_left_unfocused" geometry="tiled_left">
1039 <piece position="entire_background" draw_ops="entire_background_unfocused" />1048 <piece position="entire_background" draw_ops="entire_background_unfocused" />
1040 <piece position="titlebar" draw_ops="titlebar_fill_unfocused" />1049 <piece position="titlebar" draw_ops="titlebar_fill_unfocused_max" />
1041 <piece position="title" draw_ops="title_unfocused" />1050 <piece position="title" draw_ops="title_unfocused" />
1042 <piece position="overlay" draw_ops="border_right_unfocused" />1051 <piece position="overlay" draw_ops="border_right_unfocused" />
1043 <button function="close" state="normal" draw_ops="close_unfocused"/>1052 <button function="close" state="normal" draw_ops="close_unfocused"/>
@@ -1070,7 +1079,7 @@
10701079
1071<frame_style name="tiled_right_focused" geometry="tiled_right">1080<frame_style name="tiled_right_focused" geometry="tiled_right">
1072 <piece position="entire_background" draw_ops="entire_background_focused" />1081 <piece position="entire_background" draw_ops="entire_background_focused" />
1073 <piece position="titlebar" draw_ops="titlebar_fill_focused" />1082 <piece position="titlebar" draw_ops="titlebar_fill_focused_max" />
1074 <piece position="title" draw_ops="title_focused" />1083 <piece position="title" draw_ops="title_focused" />
1075 <piece position="overlay" draw_ops="border_left_focused" />1084 <piece position="overlay" draw_ops="border_left_focused" />
1076 <button function="close" state="normal" draw_ops="close_focused" />1085 <button function="close" state="normal" draw_ops="close_focused" />
@@ -1103,7 +1112,7 @@
11031112
1104<frame_style name="tiled_right_unfocused" geometry="tiled_right">1113<frame_style name="tiled_right_unfocused" geometry="tiled_right">
1105 <piece position="entire_background" draw_ops="entire_background_unfocused" />1114 <piece position="entire_background" draw_ops="entire_background_unfocused" />
1106 <piece position="titlebar" draw_ops="titlebar_fill_unfocused" />1115 <piece position="titlebar" draw_ops="titlebar_fill_unfocused_max" />
1107 <piece position="title" draw_ops="title_unfocused" />1116 <piece position="title" draw_ops="title_unfocused" />
1108 <piece position="overlay" draw_ops="border_left_unfocused" />1117 <piece position="overlay" draw_ops="border_left_unfocused" />
1109 <button function="close" state="normal" draw_ops="close_unfocused"/>1118 <button function="close" state="normal" draw_ops="close_unfocused"/>

Subscribers

People subscribed via source and target branches