Unity

Merge lp:~hikiko/unity/unity.em-size-in-preview-style into lp:unity

  1. unity.em-size-in-preview-style
  2. Merge into trunk
Proposed by Eleni Maria Stea
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3832
Proposed branch: lp:~hikiko/unity/unity.em-size-in-preview-style
Merge into: lp:unity
Diff against target: 576 lines (+207/-206)
7 files modified
dash/previews/ApplicationPreview.cpp (+1/-1)
dash/previews/GenericPreview.cpp (+1/-1)
dash/previews/MoviePreview.cpp (+1/-1)
dash/previews/MusicPreview.cpp (+2/-2)
dash/previews/SocialPreview.cpp (+1/-1)
unity-shared/PreviewStyle.cpp (+155/-156)
unity-shared/PreviewStyle.h (+46/-44)
To merge this branch: bzr merge lp:~hikiko/unity/unity.em-size-in-preview-style
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+222598@code.launchpad.net

Commit message

Changed the PreviewStyle.h/cpp to use em sizes (RawPixel).

Description of the change

Changed the PreviewStyle.h/cpp to use em sizes (RawPixel).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3815
http://jenkins.qa.ubuntu.com/job/unity-ci/939/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/26

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/939/rebuild

review: Approve (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3816
http://jenkins.qa.ubuntu.com/job/unity-ci/940/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/27

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/940/rebuild

review: Approve (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
Revision history for this message
Eleni Maria Stea (hikiko) wrote :

Thanks a lot for the review :) I fixed the casting and I'll merge the change to the other branch if there aren't any more missing things!

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3817
http://jenkins.qa.ubuntu.com/job/unity-ci/944/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/31/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/944/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Cool

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dash/previews/ApplicationPreview.cpp'
2--- dash/previews/ApplicationPreview.cpp 2013-11-19 18:48:35 +0000
3+++ dash/previews/ApplicationPreview.cpp 2014-06-13 08:30:39 +0000
4@@ -312,7 +312,7 @@
5
6 for (nux::AbstractButton* button : action_buttons_)
7 {
8- button->SetMinMaxSize(CLAMP((details_width - style.GetSpaceBetweenActions()) / 2, 0, style.GetActionButtonMaximumWidth()), style.GetActionButtonHeight());
9+ button->SetMinMaxSize(CLAMP(RawPixel((details_width - style.GetSpaceBetweenActions()) / 2), 0_em, style.GetActionButtonMaximumWidth()), style.GetActionButtonHeight());
10 }
11
12 Preview::PreLayoutManagement();
13
14=== modified file 'dash/previews/GenericPreview.cpp'
15--- dash/previews/GenericPreview.cpp 2013-11-19 18:48:35 +0000
16+++ dash/previews/GenericPreview.cpp 2014-06-13 08:30:39 +0000
17@@ -225,7 +225,7 @@
18
19 for (nux::AbstractButton* button : action_buttons_)
20 {
21- button->SetMinMaxSize(CLAMP((details_width - style.GetSpaceBetweenActions()) / 2, 0, style.GetActionButtonMaximumWidth()), style.GetActionButtonHeight());
22+ button->SetMinMaxSize(CLAMP(RawPixel((details_width - style.GetSpaceBetweenActions()) / 2), 0_em, style.GetActionButtonMaximumWidth()), style.GetActionButtonHeight());
23 }
24
25 Preview::PreLayoutManagement();
26
27=== modified file 'dash/previews/MoviePreview.cpp'
28--- dash/previews/MoviePreview.cpp 2013-11-19 18:48:35 +0000
29+++ dash/previews/MoviePreview.cpp 2014-06-13 08:30:39 +0000
30@@ -247,7 +247,7 @@
31
32 for (nux::AbstractButton* button : action_buttons_)
33 {
34- button->SetMinMaxSize(CLAMP((details_width - style.GetSpaceBetweenActions()) / 2, 0, style.GetActionButtonMaximumWidth()), style.GetActionButtonHeight());
35+ button->SetMinMaxSize(CLAMP(RawPixel((details_width - style.GetSpaceBetweenActions()) / 2), 0_em, style.GetActionButtonMaximumWidth()), style.GetActionButtonHeight());
36 }
37
38 Preview::PreLayoutManagement();
39
40=== modified file 'dash/previews/MusicPreview.cpp'
41--- dash/previews/MusicPreview.cpp 2013-11-19 18:48:35 +0000
42+++ dash/previews/MusicPreview.cpp 2014-06-13 08:30:39 +0000
43@@ -283,8 +283,8 @@
44
45 for (nux::AbstractButton* button : action_buttons_)
46 {
47- int action_width = CLAMP((details_width - style.GetSpaceBetweenActions()) /
48- 2, 0, style.GetActionButtonMaximumWidth());
49+ int action_width = CLAMP(RawPixel((details_width - style.GetSpaceBetweenActions()) /
50+ 2), 0_em, style.GetActionButtonMaximumWidth());
51 // do not use SetMinMax because width has to be able to grow
52 button->SetMinimumWidth(action_width);
53 button->SetMinimumHeight(style.GetActionButtonHeight());
54
55=== modified file 'dash/previews/SocialPreview.cpp'
56--- dash/previews/SocialPreview.cpp 2013-11-19 18:48:35 +0000
57+++ dash/previews/SocialPreview.cpp 2014-06-13 08:30:39 +0000
58@@ -280,7 +280,7 @@
59
60 for (nux::AbstractButton* button : action_buttons_)
61 {
62- button->SetMinMaxSize(CLAMP((details_width - style.GetSpaceBetweenActions()) / 2, 0, style.GetActionButtonMaximumWidth()), style.GetActionButtonHeight());
63+ button->SetMinMaxSize(CLAMP(RawPixel((details_width - style.GetSpaceBetweenActions()) / 2), 0_em, style.GetActionButtonMaximumWidth()), style.GetActionButtonHeight());
64 }
65
66 Preview::PreLayoutManagement();
67
68=== modified file 'unity-shared/PreviewStyle.cpp'
69--- unity-shared/PreviewStyle.cpp 2013-05-10 10:07:04 +0000
70+++ unity-shared/PreviewStyle.cpp 2014-06-13 08:30:39 +0000
71@@ -40,8 +40,8 @@
72 {
73 Style* style_instance = nullptr;
74
75-const int preview_width = 770;
76-const int preview_height = 380;
77+const RawPixel preview_width = 770_em;
78+const RawPixel preview_height = 380_em;
79
80 typedef nux::ObjectPtr<nux::BaseTexture> BaseTexturePtr;
81
82@@ -153,100 +153,99 @@
83 return new nux::ColorLayer(nux::Color(0.0f, 0.0f, 0.0f, 0.1f), true, rop);
84 }
85
86-int Style::GetNavigatorWidth() const
87-{
88- return 42;
89-}
90-
91-int Style::GetNavigatorIconSize() const
92-{
93- return 24;
94-}
95-
96-int Style::GetPreviewWidth() const
97+RawPixel Style::GetNavigatorWidth() const
98+{
99+ return 42_em;
100+}
101+
102+RawPixel Style::GetNavigatorIconSize() const
103+{
104+ return 24_em;
105+}
106+
107+RawPixel Style::GetPreviewWidth() const
108 {
109 return preview_width;
110 }
111
112-int Style::GetPreviewHeight() const
113+RawPixel Style::GetPreviewHeight() const
114 {
115 return preview_height;
116 }
117
118-
119-int Style::GetPreviewTopPadding() const
120-{
121- return 100;
122-}
123-
124-int Style::GetDetailsTopMargin() const
125-{
126- return 5;
127-}
128-
129-int Style::GetDetailsBottomMargin() const
130-{
131- return 10;
132-}
133-
134-int Style::GetDetailsRightMargin() const
135-{
136- return 10;
137-}
138-
139-int Style::GetDetailsLeftMargin() const
140-{
141- return 10;
142-}
143-
144-int Style::GetPanelSplitWidth() const
145-{
146- return 10;
147-}
148-
149-int Style::GetAppIconAreaWidth() const
150-{
151- return 105;
152-}
153-
154-int Style::GetSpaceBetweenTitleAndSubtitle() const
155-{
156- return 6;
157-}
158-
159-int Style::GetSpaceBetweenIconAndDetails() const
160-{
161- return 18;
162-}
163-
164-int Style::GetTrackHeight() const
165-{
166- return 28;
167-}
168-
169-int Style::GetMusicDurationWidth() const
170-{
171- return 40;
172-}
173-
174-int Style::GetActionButtonHeight() const
175-{
176- return 34;
177-}
178-
179-int Style::GetActionButtonMaximumWidth() const
180-{
181- return 175;
182-}
183-
184-int Style::GetSpaceBetweenActions() const
185-{
186- return 10;
187-}
188-
189-int Style::GetTrackBarHeight() const
190-{
191- return 25;
192+RawPixel Style::GetPreviewTopPadding() const
193+{
194+ return 100_em;
195+}
196+
197+RawPixel Style::GetDetailsTopMargin() const
198+{
199+ return 5_em;
200+}
201+
202+RawPixel Style::GetDetailsBottomMargin() const
203+{
204+ return 10_em;
205+}
206+
207+RawPixel Style::GetDetailsRightMargin() const
208+{
209+ return 10_em;
210+}
211+
212+RawPixel Style::GetDetailsLeftMargin() const
213+{
214+ return 10_em;
215+}
216+
217+RawPixel Style::GetPanelSplitWidth() const
218+{
219+ return 10_em;
220+}
221+
222+RawPixel Style::GetAppIconAreaWidth() const
223+{
224+ return 105_em;
225+}
226+
227+RawPixel Style::GetSpaceBetweenTitleAndSubtitle() const
228+{
229+ return 6_em;
230+}
231+
232+RawPixel Style::GetSpaceBetweenIconAndDetails() const
233+{
234+ return 18_em;
235+}
236+
237+RawPixel Style::GetTrackHeight() const
238+{
239+ return 28_em;
240+}
241+
242+RawPixel Style::GetMusicDurationWidth() const
243+{
244+ return 40_em;
245+}
246+
247+RawPixel Style::GetActionButtonHeight() const
248+{
249+ return 34_em;
250+}
251+
252+RawPixel Style::GetActionButtonMaximumWidth() const
253+{
254+ return 175_em;
255+}
256+
257+RawPixel Style::GetSpaceBetweenActions() const
258+{
259+ return 10_em;
260+}
261+
262+RawPixel Style::GetTrackBarHeight() const
263+{
264+ return 25_em;
265 }
266
267 float Style::GetAppImageAspectRatio() const
268@@ -254,24 +253,24 @@
269 return 1.0;
270 }
271
272-int Style::GetDetailsPanelMinimumWidth() const
273-{
274- return 300;
275-}
276-
277-int Style::GetInfoHintIconSizeWidth() const
278-{
279- return 24;
280-}
281-
282-int Style::GetInfoHintNameMinimumWidth() const
283-{
284- return 100;
285-}
286-
287-int Style::GetInfoHintNameMaximumWidth() const
288-{
289- return 160;
290+RawPixel Style::GetDetailsPanelMinimumWidth() const
291+{
292+ return 300_em;
293+}
294+
295+RawPixel Style::GetInfoHintIconSizeWidth() const
296+{
297+ return 24_em;
298+}
299+
300+RawPixel Style::GetInfoHintNameMinimumWidth() const
301+{
302+ return 100_em;
303+}
304+
305+RawPixel Style::GetInfoHintNameMaximumWidth() const
306+{
307+ return 160_em;
308 }
309
310 float Style::GetDescriptionLineSpacing() const
311@@ -279,19 +278,19 @@
312 return 2.0;
313 }
314
315-int Style::GetDescriptionLineCount() const
316-{
317- return 20;
318-}
319-
320-int Style::GetRatingWidgetHeight() const
321-{
322- return 36;
323-}
324-
325-int Style::GetStatusIconSize() const
326-{
327- return 12;
328+RawPixel Style::GetDescriptionLineCount() const
329+{
330+ return 20_em;
331+}
332+
333+RawPixel Style::GetRatingWidgetHeight() const
334+{
335+ return 36_em;
336+}
337+
338+RawPixel Style::GetStatusIconSize() const
339+{
340+ return 12_em;
341 }
342
343 std::string Style::payment_title_font() const
344@@ -344,39 +343,39 @@
345 return nux::Color(255, 0, 0);
346 }
347
348-int Style::GetPaymentIconAreaWidth() const
349-{
350- return 64;
351-}
352-
353-int Style::GetPaymentTextInputHeight() const
354-{
355- return 40;
356-}
357-
358-int Style::GetPaymentLockWidth() const
359-{
360- return 22;
361-}
362-
363-int Style::GetPaymentLockHeight() const
364-{
365- return 22;
366-}
367-
368-int Style::GetPaymentHeaderWidth() const
369-{
370- return 850;
371-}
372-
373-int Style::GetPaymentHeaderSpace() const
374-{
375- return 0;
376-}
377-
378-int Style::GetPaymentFormSpace() const
379-{
380- return 5;
381+RawPixel Style::GetPaymentIconAreaWidth() const
382+{
383+ return 64_em;
384+}
385+
386+RawPixel Style::GetPaymentTextInputHeight() const
387+{
388+ return 40_em;
389+}
390+
391+RawPixel Style::GetPaymentLockWidth() const
392+{
393+ return 22_em;
394+}
395+
396+RawPixel Style::GetPaymentLockHeight() const
397+{
398+ return 22_em;
399+}
400+
401+RawPixel Style::GetPaymentHeaderWidth() const
402+{
403+ return 850_em;
404+}
405+
406+RawPixel Style::GetPaymentHeaderSpace() const
407+{
408+ return 0_em;
409+}
410+
411+RawPixel Style::GetPaymentFormSpace() const
412+{
413+ return 5_em;
414 }
415
416 std::string Style::u1_warning_font() const
417@@ -389,14 +388,14 @@
418 return float(540)/380;
419 }
420
421-int Style::GetAvatarAreaWidth() const
422+RawPixel Style::GetAvatarAreaWidth() const
423 {
424- return 100;
425+ return 100_em;
426 }
427
428-int Style::GetAvatarAreaHeight() const
429+RawPixel Style::GetAvatarAreaHeight() const
430 {
431- return 100;
432+ return 100_em;
433 }
434
435 std::string Style::content_font() const
436
437=== modified file 'unity-shared/PreviewStyle.h'
438--- unity-shared/PreviewStyle.h 2013-05-10 10:07:04 +0000
439+++ unity-shared/PreviewStyle.h 2014-06-13 08:30:39 +0000
440@@ -29,6 +29,8 @@
441 #include <string>
442 #include <memory>
443
444+#include "unity-shared/RawPixel.h"
445+
446 namespace nux
447 {
448 class BaseTexture;
449@@ -57,38 +59,38 @@
450
451 static Style& Instance();
452
453- int GetNavigatorWidth() const;
454- int GetNavigatorIconSize() const;
455-
456- int GetPreviewWidth() const;
457- int GetPreviewHeight() const;
458- int GetPreviewTopPadding() const;
459-
460- int GetDetailsTopMargin() const;
461- int GetDetailsBottomMargin() const;
462- int GetDetailsRightMargin() const;
463- int GetDetailsLeftMargin() const;
464- int GetPanelSplitWidth() const;
465-
466- int GetSpaceBetweenTitleAndSubtitle() const;
467-
468- int GetActionButtonHeight() const;
469- int GetSpaceBetweenActions() const;
470- int GetActionButtonMaximumWidth() const;
471-
472- int GetDetailsPanelMinimumWidth() const;
473-
474- int GetInfoHintIconSizeWidth() const;
475- int GetInfoHintNameMinimumWidth() const;
476- int GetInfoHintNameMaximumWidth() const;
477-
478- int GetCommentNameMinimumWidth() const;
479- int GetCommentNameMaximumWidth() const;
480+ RawPixel GetNavigatorWidth() const;
481+ RawPixel GetNavigatorIconSize() const;
482+
483+ RawPixel GetPreviewWidth() const;
484+ RawPixel GetPreviewHeight() const;
485+ RawPixel GetPreviewTopPadding() const;
486+
487+ RawPixel GetDetailsTopMargin() const;
488+ RawPixel GetDetailsBottomMargin() const;
489+ RawPixel GetDetailsRightMargin() const;
490+ RawPixel GetDetailsLeftMargin() const;
491+ RawPixel GetPanelSplitWidth() const;
492+
493+ RawPixel GetSpaceBetweenTitleAndSubtitle() const;
494+
495+ RawPixel GetActionButtonHeight() const;
496+ RawPixel GetSpaceBetweenActions() const;
497+ RawPixel GetActionButtonMaximumWidth() const;
498+
499+ RawPixel GetDetailsPanelMinimumWidth() const;
500+
501+ RawPixel GetInfoHintIconSizeWidth() const;
502+ RawPixel GetInfoHintNameMinimumWidth() const;
503+ RawPixel GetInfoHintNameMaximumWidth() const;
504+
505+ RawPixel GetCommentNameMinimumWidth() const;
506+ RawPixel GetCommentNameMaximumWidth() const;
507
508 float GetDescriptionLineSpacing() const;
509- int GetDescriptionLineCount() const;
510+ RawPixel GetDescriptionLineCount() const;
511
512- int GetRatingWidgetHeight() const;
513+ RawPixel GetRatingWidgetHeight() const;
514
515 bool GetShadowBackgroundEnabled() const;
516
517@@ -113,8 +115,8 @@
518
519 float GetAppImageAspectRatio() const;
520
521- int GetAppIconAreaWidth() const;
522- int GetSpaceBetweenIconAndDetails() const;
523+ RawPixel GetAppIconAreaWidth() const;
524+ RawPixel GetSpaceBetweenIconAndDetails() const;
525 ////////////////////////////////
526
527 ////////////////////////////////
528@@ -123,22 +125,22 @@
529 std::string u1_warning_font() const;
530 nux::BaseTexture* GetWarningIcon();
531
532- int GetTrackHeight() const;
533+ RawPixel GetTrackHeight() const;
534 ////////////////////////////////
535
536 ////////////////////////////////
537 // Movie Preview
538 float GetVideoImageAspectRatio() const;
539
540- int GetTrackBarHeight() const;
541- int GetMusicDurationWidth() const;
542- int GetStatusIconSize() const;
543+ RawPixel GetTrackBarHeight() const;
544+ RawPixel GetMusicDurationWidth() const;
545+ RawPixel GetStatusIconSize() const;
546 ////////////////////////////////
547
548 ////////////////////////////////
549 // Social Preview
550- int GetAvatarAreaWidth() const;
551- int GetAvatarAreaHeight() const;
552+ RawPixel GetAvatarAreaWidth() const;
553+ RawPixel GetAvatarAreaHeight() const;
554
555 std::string content_font() const;
556
557@@ -165,13 +167,13 @@
558 nux::Color payment_error_color() const;
559
560
561- int GetPaymentIconAreaWidth() const;
562- int GetPaymentTextInputHeight() const;
563- int GetPaymentLockWidth() const;
564- int GetPaymentLockHeight() const;
565- int GetPaymentHeaderWidth() const;
566- int GetPaymentHeaderSpace() const;
567- int GetPaymentFormSpace() const;
568+ RawPixel GetPaymentIconAreaWidth() const;
569+ RawPixel GetPaymentTextInputHeight() const;
570+ RawPixel GetPaymentLockWidth() const;
571+ RawPixel GetPaymentLockHeight() const;
572+ RawPixel GetPaymentHeaderWidth() const;
573+ RawPixel GetPaymentHeaderSpace() const;
574+ RawPixel GetPaymentFormSpace() const;
575
576 /////////////////////////////////
577