elementary Stylesheet

Merge lp:~michaelfarquhar/egtk/minimize into lp:~elementary-design/egtk/trunk

  1. minimize
  2. Merge into trunk
Proposed by michael_f
Status: Merged
Approved by: Danielle Foré
Approved revision: 132
Merged at revision: 134
Proposed branch: lp:~michaelfarquhar/egtk/minimize
Merge into: lp:~elementary-design/egtk/trunk
Diff against target: 190 lines (+46/-32)
1 file modified
metacity-1/metacity-theme-3.xml (+46/-32)
To merge this branch: bzr merge lp:~michaelfarquhar/egtk/minimize
Reviewer Review Type Date Requested Status
Danielle Foré Approve
Review via email: mp+188199@code.launchpad.net

Commit message

minimize button now has proper unfocused and hover states

Description of the change

Fixed the minimize button bacause the hover didn't work when windows were maximised. I know it's not major and it's unlikely many people will see or notice but I feel it's important to have the consistency for those that do enable the minimize button.

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

This branch looks like it carries in a lot of changes other than just fixing the minimize button, including altering the copyright.

Can you make sure this is actually based on the latest branch from lp:egtk?

review: Needs Fixing
Revision history for this message
michael_f (michaelfarquhar) wrote :

Hmm, it should've been, I must've copied the entire original file (must've been an older version) rather than just the intended changes, my apologies. I'll sort this asap. Do I just need to fix the file and push or do I need to request another merge?

Revision history for this message
Danielle Foré (danrabbit) wrote :

Just push and I'll review :)

lp:~michaelfarquhar/egtk/minimize updated
129. By michael_f

Updated metacity file version to latest

Revision history for this message
Danielle Foré (danrabbit) wrote :

Typo: draw_ops name="minimize_focsed">

review: Needs Fixing
lp:~michaelfarquhar/egtk/minimize updated
130. By michael_f

fixed typo

Revision history for this message
Danielle Foré (danrabbit) wrote :

line 368: <include name="minimize_normal" />

but that doesn't exist anymore. Are you testing this branch? :p

review: Needs Fixing
Revision history for this message
michael_f (michaelfarquhar) wrote :

Gah! I thought I had them all (there's so freaking many! XD). I've been testing it and it's been working so far, though I've obviously not been finding all the different window types. I'll get there eventually...

That said I've noticed when testing this branch that Wingpanel goes completely transparent. I assume there has been some changes made to Wingpanel and the Gtk files and I have an older version of Wingpanel?

lp:~michaelfarquhar/egtk/minimize updated
131. By michael_f

fixed call to non-existant image

132. By michael_f

Fixed indentation

Revision history for this message
Danielle Foré (danrabbit) wrote :

Hey Michael is this ready to be reviewed again?

Revision history for this message
michael_f (michaelfarquhar) wrote :

Yeah, I think so.I did try to send a review request but maybe I didn't do it right.

Revision history for this message
Danielle Foré (danrabbit) wrote :

Hey Michael,

It looks like the branch is working properly :)

review: Approve
Revision history for this message
michael_f (michaelfarquhar) wrote :

Sweet Thanks! :D

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'metacity-1/metacity-theme-3.xml'
2--- metacity-1/metacity-theme-3.xml 2013-09-07 09:45:26 +0000
3+++ metacity-1/metacity-theme-3.xml 2013-10-09 15:38:03 +0000
4@@ -351,7 +351,7 @@
5
6 <!-- :: MINIMIZE ICON :: -->
7
8-<draw_ops name="minimize_normal">
9+<draw_ops name="minimize_focused">
10 <image filename="minimize.svg"
11 x="(width - object_width) / 2"
12 y="(height - object_height) / 2"
13@@ -360,12 +360,12 @@
14 </draw_ops>
15
16 <draw_ops name="minimize_hover">
17- <include name="minimize_normal" />
18+ <include name="minimize_focused" />
19 <include name="hover" />
20 </draw_ops>
21
22-<draw_ops name="minimize_pressed">
23- <include name="minimize_normal" />
24+<draw_ops name="minimize_focused_pressed">
25+ <include name="minimize_focused" />
26 <include name="pressed" />
27 </draw_ops>
28
29@@ -378,6 +378,16 @@
30 alpha="0.6"/>
31 </draw_ops>
32
33+<draw_ops name="minimize_unfocused_hover">
34+ <include name="minimize_unfocused" />
35+ <include name="hover" />
36+</draw_ops>
37+
38+<draw_ops name="minimize_unfocused_pressed">
39+ <include name="minimize_unfocused" />
40+ <include name="pressed" />
41+</draw_ops>
42+
43
44 <!-- :: BLANK :: -->
45
46@@ -396,9 +406,9 @@
47 <button function="maximize" state="normal" draw_ops="maximize_focused" />
48 <button function="maximize" state="prelight" draw_ops="maximize_hover" />
49 <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
50- <button function="minimize" state="normal" draw_ops="minimize_normal" />
51+ <button function="minimize" state="normal" draw_ops="minimize_focused" />
52 <button function="minimize" state="prelight" draw_ops="minimize_hover" />
53- <button function="minimize" state="pressed" draw_ops="minimize_pressed" />
54+ <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
55 <button function="menu" state="normal" draw_ops="blank" />
56 <button function="menu" state="pressed" draw_ops="blank" />
57 <button function="shade" state="normal" draw_ops="blank" />
58@@ -427,9 +437,9 @@
59 <button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
60 <button function="maximize" state="prelight" draw_ops="maximize_unfocused_hover"/>
61 <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
62- <button function="minimize" state="normal" draw_ops="minimize_normal"/>
63- <button function="minimize" state="prelight" draw_ops="minimize_hover"/>
64- <button function="minimize" state="pressed" draw_ops="minimize_pressed"/>
65+ <button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
66+ <button function="minimize" state="prelight" draw_ops="minimize_unfocused_hover"/>
67+ <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
68 <button function="menu" state="normal" draw_ops="blank" />
69 <button function="menu" state="prelight" draw_ops="blank" />
70 <button function="menu" state="pressed" draw_ops="blank" />
71@@ -460,8 +470,9 @@
72 <button function="maximize" state="prelight" draw_ops="unmaximize_hover" />
73 <button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed" />
74
75- <button function="minimize" state="normal" draw_ops="minimize_normal"/>
76- <button function="minimize" state="pressed" draw_ops="minimize_pressed"/>
77+ <button function="minimize" state="normal" draw_ops="minimize_focused"/>
78+ <button function="minimize" state="prelight" draw_ops="minimize_hover"/>
79+ <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed"/>
80 <button function="menu" state="normal" draw_ops="blank" />
81 <button function="menu" state="pressed" draw_ops="blank" />
82 <button function="shade" state="normal" draw_ops="blank" />
83@@ -489,8 +500,9 @@
84 <button function="maximize" state="prelight" draw_ops="unmaximize_unfocused_hover"/>
85 <button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/>
86
87- <button function="minimize" state="normal" draw_ops="minimize_normal"/>
88- <button function="minimize" state="pressed" draw_ops="minimize_pressed"/>
89+ <button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
90+ <button function="minimize" state="prelight" draw_ops="minimize_unfocused_hover"/>
91+ <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
92 <button function="menu" state="normal" draw_ops="blank" />
93 <button function="menu" state="pressed" draw_ops="blank" />
94 <button function="shade" state="normal" draw_ops="blank" />
95@@ -519,8 +531,9 @@
96 <button function="maximize" state="prelight" draw_ops="unmaximize_hover" />
97 <button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed" />
98
99- <button function="minimize" state="normal" draw_ops="minimize_normal"/>
100- <button function="minimize" state="pressed" draw_ops="minimize_pressed"/>
101+ <button function="minimize" state="normal" draw_ops="minimize_focused"/>
102+ <button function="minimize" state="prelight" draw_ops="minimize_hover"/>
103+ <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed"/>
104 <button function="menu" state="normal" draw_ops="blank" />
105 <button function="menu" state="pressed" draw_ops="blank" />
106 <button function="shade" state="normal" draw_ops="blank" />
107@@ -549,8 +562,9 @@
108 <button function="maximize" state="prelight" draw_ops="unmaximize_unfocused_hover"/>
109 <button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/>
110
111- <button function="minimize" state="normal" draw_ops="minimize_normal"/>
112- <button function="minimize" state="pressed" draw_ops="minimize_pressed"/>
113+ <button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
114+ <button function="minimize" state="prelight" draw_ops="minimize_unfocused_hover"/>
115+ <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
116 <button function="menu" state="normal" draw_ops="blank" />
117 <button function="menu" state="pressed" draw_ops="blank" />
118 <button function="shade" state="normal" draw_ops="blank" />
119@@ -576,8 +590,8 @@
120 <button function="close" state="pressed" draw_ops="close_focused_pressed" />
121 <button function="maximize" state="normal" draw_ops="maximize_focused" />
122 <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
123- <button function="minimize" state="normal" draw_ops="minimize_normal" />
124- <button function="minimize" state="pressed" draw_ops="minimize_pressed" />
125+ <button function="minimize" state="normal" draw_ops="minimize_focused" />
126+ <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
127 <button function="menu" state="normal" draw_ops="blank" />
128 <button function="menu" state="pressed" draw_ops="blank" />
129 <button function="shade" state="normal" draw_ops="blank" />
130@@ -606,9 +620,9 @@
131 <button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
132 <button function="maximize" state="prelight" draw_ops="maximize_unfocused_hover"/>
133 <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
134- <button function="minimize" state="normal" draw_ops="minimize_normal"/>
135- <button function="minimize" state="prelight" draw_ops="minimize_hover"/>
136- <button function="minimize" state="pressed" draw_ops="minimize_pressed"/>
137+ <button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
138+ <button function="minimize" state="prelight" draw_ops="minimize_unfocused_hover"/>
139+ <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
140 <button function="menu" state="normal" draw_ops="blank" />
141 <button function="menu" state="prelight" draw_ops="blank" />
142 <button function="menu" state="pressed" draw_ops="blank" />
143@@ -637,8 +651,8 @@
144 <button function="close" state="pressed" draw_ops="close_focused_pressed" />
145 <button function="maximize" state="normal" draw_ops="maximize_focused" />
146 <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
147- <button function="minimize" state="normal" draw_ops="minimize_normal" />
148- <button function="minimize" state="pressed" draw_ops="minimize_pressed" />
149+ <button function="minimize" state="normal" draw_ops="minimize_focused" />
150+ <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
151 <button function="menu" state="normal" draw_ops="blank" />
152 <button function="menu" state="pressed" draw_ops="blank" />
153 <button function="shade" state="normal" draw_ops="blank" />
154@@ -667,9 +681,9 @@
155 <button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
156 <button function="maximize" state="prelight" draw_ops="maximize_unfocused_hover"/>
157 <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
158- <button function="minimize" state="normal" draw_ops="minimize_normal"/>
159- <button function="minimize" state="prelight" draw_ops="minimize_hover"/>
160- <button function="minimize" state="pressed" draw_ops="minimize_pressed"/>
161+ <button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
162+ <button function="minimize" state="prelight" draw_ops="minimize_unfocused_hover"/>
163+ <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
164 <button function="menu" state="normal" draw_ops="blank" />
165 <button function="menu" state="prelight" draw_ops="blank" />
166 <button function="menu" state="pressed" draw_ops="blank" />
167@@ -698,8 +712,8 @@
168 <button function="close" state="pressed" draw_ops="close_focused_pressed" />
169 <button function="maximize" state="normal" draw_ops="maximize_focused" />
170 <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
171- <button function="minimize" state="normal" draw_ops="minimize_normal" />
172- <button function="minimize" state="pressed" draw_ops="minimize_pressed" />
173+ <button function="minimize" state="normal" draw_ops="minimize_focused" />
174+ <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
175 <button function="menu" state="normal" draw_ops="blank" />
176 <button function="menu" state="pressed" draw_ops="blank" />
177 <button function="shade" state="normal" draw_ops="blank" />
178@@ -728,9 +742,9 @@
179 <button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
180 <button function="maximize" state="prelight" draw_ops="maximize_unfocused_hover"/>
181 <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
182- <button function="minimize" state="normal" draw_ops="minimize_normal"/>
183- <button function="minimize" state="prelight" draw_ops="minimize_hover"/>
184- <button function="minimize" state="pressed" draw_ops="minimize_pressed"/>
185+ <button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
186+ <button function="minimize" state="prelight" draw_ops="minimize_unfocused_hover"/>
187+ <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
188 <button function="menu" state="normal" draw_ops="blank" />
189 <button function="menu" state="prelight" draw_ops="blank" />
190 <button function="menu" state="pressed" draw_ops="blank" />

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: