Merge lp:~muktupavels/ubuntu-themes/simplify-metacity-theme into lp:ubuntu-themes

Proposed by Alberts Muktupāvels on 2016-07-12
Status: Merged
Approved by: Iain Lane on 2016-07-14
Approved revision: 489
Merged at revision: 491
Proposed branch: lp:~muktupavels/ubuntu-themes/simplify-metacity-theme
Merge into: lp:ubuntu-themes
Diff against target: 64 lines (+8/-8)
2 files modified
Ambiance/metacity-1/metacity-theme-1.xml (+4/-4)
Radiance/metacity-1/metacity-theme-1.xml (+4/-4)
To merge this branch: bzr merge lp:~muktupavels/ubuntu-themes/simplify-metacity-theme
Reviewer Review Type Date Requested Status
Iain Lane 2016-07-12 Approve on 2016-07-14
Dmitry Shachnev Pending
Lars Karlitski 2016-07-12 Pending
Ubuntu Artwork Packagers 2016-07-12 Pending
Review via email: mp+299872@code.launchpad.net

Commit message

Simplify Metacity theme by replacing solid color image with filled rectangle to improve HiDPI support.

Description of the change

Initial HiDPI support was backported to Metacity 3.18.3, but it has at least 3 problems:

1) gradients does not scale well - there is 1px transparent line between titlebar and client window:
   https://s32.postimg.org/g5az52ukx/line.png

This is fixed in Metacity 3.18.6.

2) unfocused window middle button backgrounds does not scale well:
   https://s32.postimg.org/66q0ill5d/background.png

This merge proposal fixes problem by simply replacing image backgrounds with filled rectangles.

3) windows with odd width or height is not properly scaled because of rounding error - width and height has -1px error:
   https://s32.postimg.org/awpdvvw2t/Screenshot_from_2016_07_13_00_04_40.png

This one will not be fixed in 3.18.x.

To post a comment you must log in.
Alberts Muktupāvels (muktupavels) wrote :

Initial HiDPI support was backported to Metacity 3.18.3, but it has at least 3 problems:

1) gradients does not scale well - there is 1px transparent line between titlebar and client window:
   https://s32.postimg.org/g5az52ukx/line.png

This is fixed in Metacity 3.18.6.

2) unfocused window middle button backgrounds does not scale well:
   https://s32.postimg.org/66q0ill5d/background.png

This merge proposal fixes problem by simply replacing image backgrounds with filled rectangles.

3) windows with odd width or height is not properly scaled because of rounding error - width and height has -1px error:
   https://s32.postimg.org/awpdvvw2t/Screenshot_from_2016_07_13_00_04_40.png

This one will not be fixed in 3.18.x.

Iain Lane (laney) wrote :

do you have an "after" screenshot?

Iain Lane (laney) wrote :

Great, thanks!

review: Approve
Iain Lane (laney) wrote :

Dmitry, do you want to take care of uploading this through the CI train?

Dmitry Shachnev (mitya57) wrote :

Yes, I will do it.

Iain Lane (laney) wrote :

On Thu, Jul 14, 2016 at 09:22:54AM -0000, Dmitry Shachnev wrote:
> Yes, I will do it.

Nice one, thank you :)

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Alberts Muktupāvels (muktupavels) wrote :

Maybe this can be fixed also in 16.04?

Dmitry Shachnev (mitya57) wrote :

Alberts, I can do it too, but I'll ask you to file a bug on Launchpad for that.

Dmitry Shachnev (mitya57) wrote :

There is no free landing PPA today, will try later.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ambiance/metacity-1/metacity-theme-1.xml'
2--- Ambiance/metacity-1/metacity-theme-1.xml 2015-01-01 18:17:47 +0000
3+++ Ambiance/metacity-1/metacity-theme-1.xml 2016-07-12 20:46:00 +0000
4@@ -216,10 +216,10 @@
5 <image filename="trough_unfocused_left.png" x="0" y="1" width="object_width" height="object_height"/>
6 </draw_ops>
7 <draw_ops name="left_middle_background_unfocused_normal">
8- <image filename="trough_unfocused_middle.png" x="0" y="1" width="object_width" height="object_height"/>
9+ <rectangle color="#3c3b37" filled="true" x="0" y="1" width="width" height="height"/>
10 </draw_ops>
11 <draw_ops name="left_middle_background_unfocused_pressed">
12- <image filename="trough_unfocused_middle.png" x="0" y="1" width="object_width" height="object_height"/>
13+ <rectangle color="#3c3b37" filled="true" x="0" y="1" width="width" height="height"/>
14 </draw_ops>
15 <draw_ops name="left_right_background_unfocused_normal">
16 <image filename="trough_unfocused_right.png" x="0" y="1" width="object_width" height="object_height"/>
17@@ -254,10 +254,10 @@
18 <image filename="trough_unfocused_left.png" x="0" y="1" width="object_width" height="object_height"/>
19 </draw_ops>
20 <draw_ops name="right_middle_background_unfocused_normal">
21- <image filename="trough_unfocused_middle.png" x="0" y="1" width="object_width" height="object_height"/>
22+ <rectangle color="#3c3b37" filled="true" x="0" y="1" width="width" height="height"/>
23 </draw_ops>
24 <draw_ops name="right_middle_background_unfocused_pressed">
25- <image filename="trough_unfocused_middle.png" x="0" y="1" width="object_width" height="object_height"/>
26+ <rectangle color="#3c3b37" filled="true" x="0" y="1" width="width" height="height"/>
27 </draw_ops>
28 <draw_ops name="right_right_background_unfocused_normal">
29 <image filename="trough_unfocused_right.png" x="0" y="1" width="object_width" height="object_height"/>
30
31=== removed file 'Ambiance/metacity-1/trough_unfocused_middle.png'
32Binary files Ambiance/metacity-1/trough_unfocused_middle.png 2012-02-29 10:33:15 +0000 and Ambiance/metacity-1/trough_unfocused_middle.png 1970-01-01 00:00:00 +0000 differ
33=== modified file 'Radiance/metacity-1/metacity-theme-1.xml'
34--- Radiance/metacity-1/metacity-theme-1.xml 2015-01-01 18:17:47 +0000
35+++ Radiance/metacity-1/metacity-theme-1.xml 2016-07-12 20:46:00 +0000
36@@ -213,10 +213,10 @@
37 <image filename="trough_unfocused_left.png" x="0" y="1" width="object_width" height="object_height"/>
38 </draw_ops>
39 <draw_ops name="left_middle_background_unfocused_normal">
40- <image filename="trough_unfocused_middle.png" x="0" y="1" width="object_width" height="object_height"/>
41+ <rectangle color="#dfd7cf" filled="true" x="0" y="1" width="width" height="height"/>
42 </draw_ops>
43 <draw_ops name="left_middle_background_unfocused_pressed">
44- <image filename="trough_unfocused_middle.png" x="0" y="1" width="object_width" height="object_height"/>
45+ <rectangle color="#dfd7cf" filled="true" x="0" y="1" width="width" height="height"/>
46 </draw_ops>
47 <draw_ops name="left_right_background_unfocused_normal">
48 <image filename="trough_unfocused_right.png" x="0" y="1" width="object_width" height="object_height"/>
49@@ -251,10 +251,10 @@
50 <image filename="trough_unfocused_left.png" x="0" y="1" width="object_width" height="object_height"/>
51 </draw_ops>
52 <draw_ops name="right_middle_background_unfocused_normal">
53- <image filename="trough_unfocused_middle.png" x="0" y="1" width="object_width" height="object_height"/>
54+ <rectangle color="#dfd7cf" filled="true" x="0" y="1" width="width" height="height"/>
55 </draw_ops>
56 <draw_ops name="right_middle_background_unfocused_pressed">
57- <image filename="trough_unfocused_middle.png" x="0" y="1" width="object_width" height="object_height"/>
58+ <rectangle color="#dfd7cf" filled="true" x="0" y="1" width="width" height="height"/>
59 </draw_ops>
60 <draw_ops name="right_right_background_unfocused_normal">
61 <image filename="trough_unfocused_right.png" x="0" y="1" width="object_width" height="object_height"/>
62
63=== removed file 'Radiance/metacity-1/trough_unfocused_middle.png'
64Binary files Radiance/metacity-1/trough_unfocused_middle.png 2012-02-29 10:33:15 +0000 and Radiance/metacity-1/trough_unfocused_middle.png 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches