Merge lp:~dashua/light-themes/border-less.metacity.and.fixes into lp:~ubuntu-art-pkg/light-themes/trunk

[Paul Sladen]

Marking a review so that it's possible to comment on it.

[Paul Sladen (sladen)]

debian/changelog needs combining with what's already there. (move changes to be under the current "UNRELEASED" entry and underneath [James Schriver]. (Also combine Andreas' entries under one name entry).

review: Needs Fixing

[Paul Sladen (sladen)]

New bug for tracking the request to re-apply zero-pixels borders (also wants linking in the debian/changelog).

  Bug #740579 ("Wishlist: move to 0px borders now that Unity and Unity-2D/Metacity can cope")

[Florian Boucault (fboucault)]

I am not very good at reading metacity's themes. Do you guys have a description or even a screenshot of what it would look like with Metacity (used by Ubuntu Classic without effects and Unity 2D)?

[lp:~dashua/light-themes/border-less.metacity.and.fixes]

72. By James Schriver <email address hidden> on 2011-03-23

  - Add border-less metacity themes and fixes (LP: #733431)
  - Move to 0px borders now that Unity and Unity-2D/Metacity can cope (LP: #7$
* Radiance/apps/chromium.rc
  - Fix incognito theming in Radiance (LP: #697854)

73. By James Schriver <email address hidden> on 2011-03-23

  * Ambiance/metacity/metacity-theme-1.xml
    - Fix naming in metacity theme

[James Schriver (dashua)]

I think I fixed everything :)

[lp:~dashua/light-themes/border-less.metacity.and.fixes]

74. By James Schriver <email address hidden> on 2011-03-23

Add previous u1 changes

[Paul Sladen (sladen)]

Florian: on bug #733431 comment #1 somebody called Florian pasted a screenshot of zero-pixels borders:

  http://launchpadlibrarian.net/66146936/Screenshot.png

Is that what you're after? ;-)

[Florian Boucault (fboucault)]

Paul, yes, thanks. I thought we agreed we would _not_ introduce that visual result again.

[Florian Boucault (fboucault)]

bug 740576 says "move to 0px borders now that Unity and Unity-2D/Metacity can cope". What does "Unity-2D/Metacity can cope" means?

[Paul Sladen (sladen)]

Hello Florian, I believe (from memory) that the succession of public development conversation has been the following, please correct it if it's wrong:

  (1) bug #733233 - document/implement 0x borders and shadows that were previously only documented/suggested on a private design mailing list
  (2) bug #733431 - document/revert 0px border issues from 'light-themes', reflecting the original concerns expressed on a private mailing list in February that there might be problems (sladen) and subsequently fix Unity-2D to cope (njpatel)
  (3) bug #740576 - document/re-add 0px borders into light-themes - proposal, for discussion, tracking, possible deployment

Specifically on the question of "Unity-2D can cope" this is based on the belief that a fix for (2) to 'unity-2d' may have been committed based. This is based on the status updates made in bug #733431 comment #6.1 and comment 6.2:

  * 2011-03-12: Florian Boucault changed in unity-2d: status: Confirmed → Fix Committed
  * 2011-03-13: Vish on changed in light-themes: status: Fix Committed → Fix Released

Admittedly, the changelogs available for 'unity-2d' in Ubuntu do not record a link to bug #733431 it is not easy to traceback further via the metadata available. In the 'debian/changelog' there is simply a mention of a "New upstream Version release" two days after the above status changes:

  http://changelogs.ubuntu.com/changelogs/pool/main/u/unity-2d/unity-2d_3.6.2-0ubuntu2/changelog

  unity-2d (3.6.2-0ubuntu1) natty; urgency=low
  * New upstream bugfix release
   -- Oliver Grawert <email address hidden> Tue, 15 Mar 2011 17:59:55 +0100

If there is a technical reason why zero-pixel borders will not work on Unity-2D as of 3.6.2-0ubuntu1, it would be most useful to get it documented on bug #740576 as at the moment it would imply that the current title is misleading.

(It's probably worth noting that I, personally, am indifferent and do not have a preference or desire either way. However, I do like discussion, clarity and ability to track the development process with each change *clearly* mapping back to its rationale (the bug report), its implementation (the linked branches) and its deployment (the distro Committed/Released status).

[Florian Boucault (fboucault)]

Bug #733431 was marked as Fix Committed in Unity 2D because the bug "Windows lack borders: visually unpleasant and leaves only one option to resize" was fixed. The fix was simply the revert to 1px borders in light-themes.

Making borders 0px again will reopen this very same bug.

[Florian Boucault (fboucault)]

To be very clear, no one did any work on the Unity 2D side. Also, it is not specific to Unity 2D, it is a general metacity issue. If there is something to do to support 0px borders without triggering bug #733431, it's there.

I did not know that the task "[...] subsequently fix Unity-2D to cope (njpatel)" was assigned to njpatel nor do I know any plans in that regard.

[Paul Sladen (sladen)]

James: sorry, this is going to be blocked on not having the capability in Metacity. That would need fixing first.

review: Needs Fixing

[James Schriver (dashua)]

Oh man, should I publish a branch with the other fixes absent the metacity fixes?

[Paul Sladen (sladen)]

James: good thinking, can you resync/merge against lp:light-themes and propose the rest of the changes and then push that (plus the necessary 'debian/changelog' tweaks to reflect the changes).

Unmerged revisions

74. By James Schriver <email address hidden> on 2011-03-23

Add previous u1 changes

73. By James Schriver <email address hidden> on 2011-03-23

  * Ambiance/metacity/metacity-theme-1.xml
    - Fix naming in metacity theme

72. By James Schriver <email address hidden> on 2011-03-23

  - Add border-less metacity themes and fixes (LP: #733431)
  - Move to 0px borders now that Unity and Unity-2D/Metacity can cope (LP: #7$
* Radiance/apps/chromium.rc
  - Fix incognito theming in Radiance (LP: #697854)

71. By James Schriver <email address hidden> on 2011-03-22

* Ambiance/Radiance/metacity/metacity-theme-1.xml
  - Add border-less metacity themes and fixes

=== modified file 'Ambiance/gtk-2.0/apps/chromium.rc'
--- Ambiance/gtk-2.0/apps/chromium.rc	2011-03-17 13:57:19 +0000
+++ Ambiance/gtk-2.0/apps/chromium.rc	2011-03-23 04:19:21 +0000
@@ -12,7 +12,7 @@
 style "chrome-gtk-frame"
 {
   ChromeGtkFrame::frame-color = "#3c3b37"
-  ChromeGtkFrame::inactive-frame-color = "#3c3b37"
+  ChromeGtkFrame::inactive-frame-color = lighter ("#3c3b37")
 
   ChromeGtkFrame::frame-gradient-size = 16
   ChromeGtkFrame::frame-gradient-color = "#5c5b56"

=== modified file 'Ambiance/metacity-1/metacity-theme-1.xml'
--- Ambiance/metacity-1/metacity-theme-1.xml	2011-03-12 14:23:38 +0000
+++ Ambiance/metacity-1/metacity-theme-1.xml	2011-03-23 04:19:21 +0000
@@ -5,15 +5,15 @@
   	<name>Ambiance</name>
   	<author>Kenneth Wimer, James Schriver, Andrea Cimitan</author>
   	<copyright>Canonical Ltd.</copyright>
-  	<date>Aug, 2010</date>
+  	<date>March, 2011</date>
   	<description>Metacity theme</description>
 </info>
 
 <!-- General window layout -->
 <frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="true" rounded_top_right="true"  rounded_bottom_left="false" rounded_bottom_right="false">
- 	<distance name="left_width" value="1"/>
-	<distance name="right_width" value="1"/>
-	<distance name="bottom_height" value="1"/>
+ 	<distance name="left_width" value="0"/>
+	<distance name="right_width" value="0"/>
+	<distance name="bottom_height" value="0"/>
 	<distance name="left_titlebar_edge" value="10"/>
 	<distance name="right_titlebar_edge" value="10"/>
 	<distance name="button_width" value="18"/>
@@ -110,24 +110,11 @@
     </gradient>
     
     <!-- Titlebar outline -->
-    <rectangle color="shade/#3c3b37/1.2" filled="false" x="0" y="0" width="width - 1" height="top_height - 1"/>
+    <rectangle color="#3c3b37" filled="false" x="0" y="0" width="width - 1" height="top_height - 1"/>
 
     <!-- Topmost lines -->
     <line color="shade/#3c3b37/1.2" x1="0" x2="width" y1="0" y2="0"/>
     <line color="shade/#5c5b56/1.1" x1="0" x2="width" y1="1" y2="1"/>
-    
-    <!-- Darkening of the left arch -->
-    <line color="shade/#3c3b37/1.2" x1="0" x2="4" y1="1" y2="1"/>
-    <line color="shade/#3c3b37/1.2" x1="0" x2="2" y1="2" y2="2"/>
-    <line color="shade/#3c3b37/1.2" x1="0" x2="1" y1="3" y2="3"/>
-    <line color="shade/#3c3b37/1.2" x1="0" x2="1" y1="4" y2="4"/>
-    
-    <line color="shade/#3c3b37/1.2" x1="width-5" x2="width" y1="1" y2="1"/>
-    <line color="shade/#3c3b37/1.2" x1="width-3" x2="width" y1="2" y2="2"/>
-    <line color="shade/#3c3b37/1.2" x1="width-2" x2="width" y1="3" y2="3"/>
-    <line color="shade/#3c3b37/1.2" x1="width-2" x2="width" y1="4" y2="4"/>
-
-    <line color="shade/#3c3b37/0.9" x1="1" y1="top_height - 1" x2="width - 2" y2="top_height - 1"/>
 </draw_ops>
 
 <draw_ops name="draw_title_unfocused">
@@ -139,24 +126,13 @@
     </gradient>
 
     <!-- Titlebar outline -->
-    <rectangle color="shade/#3c3b37/1.2" filled="false" x="0" y="0" width="width - 1" height="top_height - 1"/>
+    <rectangle color="#3c3b37" filled="false" x="0" y="0" width="width - 1" height="top_height - 1"/>
 
     <!-- Topmost lines -->
     <line color="shade/#3c3b37/1.16" x1="0" x2="width" y1="0" y2="0"/>
     <line color="shade/#494844/1.14" x1="0" x2="width" y1="1" y2="1"/>
     
-    <!-- Darkening of the left arch -->
-    <line color="shade/#3c3b37/1.2" x1="0" x2="4" y1="1" y2="1"/>
-    <line color="shade/#3c3b37/1.2" x1="0" x2="2" y1="2" y2="2"/>
-    <line color="shade/#3c3b37/1.2" x1="0" x2="1" y1="3" y2="3"/>
-    <line color="shade/#3c3b37/1.2" x1="0" x2="1" y1="4" y2="4"/>
     
-    <line color="shade/#3c3b37/1.2" x1="width-5" x2="width" y1="1" y2="1"/>
-    <line color="shade/#3c3b37/1.2" x1="width-3" x2="width" y1="2" y2="2"/>
-    <line color="shade/#3c3b37/1.2" x1="width-2" x2="width" y1="3" y2="3"/>
-    <line color="shade/#3c3b37/1.2" x1="width-2" x2="width" y1="4" y2="4"/>
-  
-    <line color="shade/#3c3b37/0.9" x1="1" y1="top_height - 1" x2="width - 2" y2="top_height - 1"/>
 </draw_ops>
 
 <draw_ops name="draw_title_inactive">
@@ -423,8 +399,8 @@
 	<button function="close" state="normal" draw_ops="close_focused_normal"/>
 	<button function="close" state="prelight" draw_ops="close_focused_prelight"/>
 	<button function="close" state="pressed" draw_ops="close_focused_pressed"/>
-	<shadow radius="45.0" opacity="0.75" color="#abde4f" x_offset="1" y_offset="4"/>
-	<padding left="5" right="5" bottom="5"/>
+	<shadow radius="16.0" opacity="1.3" color="#abde4f" x_offset="1" y_offset="4"/>
+	<padding left="7" right="7" bottom="7"/>
 </frame_style>
 
 <frame_style name="normal_unfocused" geometry="frame_geometry_normal">

=== modified file 'Radiance/gtk-2.0/apps/chromium.rc'
--- Radiance/gtk-2.0/apps/chromium.rc	2011-03-17 13:57:19 +0000
+++ Radiance/gtk-2.0/apps/chromium.rc	2011-03-23 04:19:21 +0000
@@ -17,8 +17,8 @@
   ChromeGtkFrame::frame-gradient-size = 16
   ChromeGtkFrame::frame-gradient-color = shade (0.97, @bg_color)
 
-  ChromeGtkFrame::incognito-frame-color = lighter ("#dfd7cf")
-  ChromeGtkFrame::incognito-inactive-frame-color = lighter ("#dfd7cf")
+  ChromeGtkFrame::incognito-frame-color = "#dfd7cf"
+  ChromeGtkFrame::incognito-inactive-frame-color = "#dfd7cf"
 
   ChromeGtkFrame::incognito-frame-gradient-size = 16
   ChromeGtkFrame::incognito-frame-gradient-color = shade (0.97, @bg_color)

=== modified file 'Radiance/metacity-1/metacity-theme-1.xml'
--- Radiance/metacity-1/metacity-theme-1.xml	2011-03-21 19:28:15 +0000
+++ Radiance/metacity-1/metacity-theme-1.xml	2011-03-23 04:19:21 +0000
@@ -11,9 +11,9 @@
 
 <!-- General window layout -->
 <frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="true" rounded_top_right="true"  rounded_bottom_left="false" rounded_bottom_right="false">
- 	<distance name="left_width" value="1"/>
-	<distance name="right_width" value="1"/>
-	<distance name="bottom_height" value="1"/>
+ 	<distance name="left_width" value="0"/>
+	<distance name="right_width" value="0"/>
+	<distance name="bottom_height" value="0"/>
 	<distance name="left_titlebar_edge" value="10"/>
 	<distance name="right_titlebar_edge" value="10"/>
 	<distance name="button_width" value="18"/>
@@ -101,6 +101,7 @@
          y="(((height - title_height) / 2) `max` 0)"/>
 </draw_ops>
 
+
 <draw_ops name="draw_title">
     <!-- Background gradient -->
     <gradient type="vertical" x="0" y="0" width="width" height="top_height">

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-22 02:13:52 +0000
+++ debian/changelog	2011-03-23 04:19:21 +0000
@@ -4,11 +4,9 @@
   * Ambiance/Radiance/gtk-2.0/gtkrc
     - Fix inconsistent menu item distances (LP: #659866)
 
-  [Andrea Cimitan]
   * Ambiance/apps/gnome-terminal.rc
     - Add dark-terminal theming to tweak resize grip 
 
-  [Andrea Cimitan]
   * Ambiance/Radiance/apps/chromium.rc
     - Add specific chromium theming bits (LP: #697854)
 
@@ -21,8 +19,13 @@
     - Fix borderless overlap (LP: #733504)*
     - Update <info> meta-data; version, and incorrect Radiance *name*.
     - Downcase some hexadecimal colours
-
- -- James schriver <[e-mail]>  Mon, 21 Mar 2011 22:11:28 -0400
+    - Add border-less metacity themes and fixes (LP: #733431)
+    - Move to 0px borders now that Unity and Unity-2D/Metacity can cope (LP: #7$
+
+  * Radiance/apps/chromium.rc
+    - Fix incognito theming in Radiance (LP: #697854)
+
+ -- James Schriver <[e-mail]>  Wed, 23 Mar 2011 00:06:35 -0400
 
 light-themes (0.1.8.10) natty; urgency=low