1
=== modified file 'launcher/Launcher.cpp'
2
--- launcher/Launcher.cpp	2012-09-01 16:01:02 +0000
3
+++ launcher/Launcher.cpp	2012-09-03 00:09:22 +0000
4
@@ -953,7 +953,10 @@
5
953
nux::Color FullySaturateColor (nux::Color color)
953
nux::Color FullySaturateColor (nux::Color color)
6
954
{
954
{
7
955
  float max = std::max<float>(color.red, std::max<float>(color.green, color.blue));
955
  float max = std::max<float>(color.red, std::max<float>(color.green, color.blue));
9
956
  color = color * (1.0f / max);
956
  if (max > 0.0f)
10
957
  {
11
958
    color = color * (1.0f / max);
12
959
  }
13
957
  return color;
960
  return color;
14
958
}
961
}
15
959
962
16
960
963
17
=== modified file 'manual-tests/Launcher.txt'
18
--- manual-tests/Launcher.txt	2012-08-30 22:24:40 +0000
19
+++ manual-tests/Launcher.txt	2012-09-03 00:09:22 +0000
20
@@ -731,3 +731,21 @@
21
731
731
22
732
Expected Results:
732
Expected Results:
23
733
* The gedit window must not flicker behind the launcher.
733
* The gedit window must not flicker behind the launcher.
24
734
25
735
26
736
Custom background color works
27
737
-----------------------------
28
738
This test ensures that the custom background color (set via ccsm) works correctly.
29
739
30
740
Setup: 
31
741
#. Ensure that ccsm is installed (package compizconfig-settings-manager)
32
742
33
743
Actions:  
34
744
#. Open ccsm
35
745
#. Click on Ubuntu Unity Plugin
36
746
#. Choose Experimental tab, click on Background Color, set Color name to #000000 and Opacity to 180
37
747
38
748
Expected Result:
39
749
 The background color of the Launcher is black, and the icons are still visible.
40
750
 The Launcher must stay black when Dash or HUD are opened, and the color must
41
751
 be persistent between sessions (logout/login).
42
734
752
43
=== modified file 'unity-shared/BGHash.cpp'
44
--- unity-shared/BGHash.cpp	2012-08-15 05:29:29 +0000
45
+++ unity-shared/BGHash.cpp	2012-09-03 00:09:22 +0000
46
@@ -46,17 +46,17 @@
47
46
{
46
{
48
47
  override_color_ = color;
47
  override_color_ = color;
49
48
48
51
49
  if (override_color_.alpha)
49
  RefreshColor();
52
50
}
53
51
54
52
void BGHash::RefreshColor()
55
53
{
56
54
  if (override_color_.alpha > 0.0f)
57
50
  {
55
  {
58
51
    TransitionToNewColor(override_color_);
56
    TransitionToNewColor(override_color_);
59
52
    return;
57
    return;
60
53
  }
58
  }
61
54
59
62
55
  RefreshColor();
63
56
}
64
57
65
58
void BGHash::RefreshColor()
66
59
{
67
60
  Atom         real_type;
60
  Atom         real_type;
68
61
  gint         result;
61
  gint         result;
69
62
  gint         real_format;
62
  gint         real_format;
Reviewer	Date Requested	Status
MC Return (community)		Approve on 2012-09-03
Andrea Azzarone (community)		Approve on 2012-09-01
Nick Dedekind (community)		Approve on 2012-08-22
Daniel van Vugt	2012-09-03	Pending
Omer Akram	2012-07-12	Pending
Thomi Richards	2012-07-12	Pending
Review via email: mp+114647@code.launchpad.net
1	=== modified file 'launcher/Launcher.cpp'
2	--- launcher/Launcher.cpp 2012-09-01 16:01:02 +0000
3	+++ launcher/Launcher.cpp 2012-09-03 00:09:22 +0000
4	@@ -953,7 +953,10 @@
5	953	nux::Color FullySaturateColor (nux::Color color)	953	nux::Color FullySaturateColor (nux::Color color)
6	954	{	954	{
7	955	float max = std::max<float>(color.red, std::max<float>(color.green, color.blue));	955	float max = std::max<float>(color.red, std::max<float>(color.green, color.blue));
9	956	color = color * (1.0f / max);	956	if (max > 0.0f)
10			957	{
11			958	color = color * (1.0f / max);
12			959	}
13	957	return color;	960	return color;
14	958	}	961	}
15	959		962
16	960		963
17	=== modified file 'manual-tests/Launcher.txt'
18	--- manual-tests/Launcher.txt 2012-08-30 22:24:40 +0000
19	+++ manual-tests/Launcher.txt 2012-09-03 00:09:22 +0000
20	@@ -731,3 +731,21 @@
21	731		731
22	732	Expected Results:	732	Expected Results:
23	733	* The gedit window must not flicker behind the launcher.	733	* The gedit window must not flicker behind the launcher.
24			734
25			735
26			736	Custom background color works
27			737	-----------------------------
28			738	This test ensures that the custom background color (set via ccsm) works correctly.
29			739
30			740	Setup:
31			741	#. Ensure that ccsm is installed (package compizconfig-settings-manager)
32			742
33			743	Actions:
34			744	#. Open ccsm
35			745	#. Click on Ubuntu Unity Plugin
36			746	#. Choose Experimental tab, click on Background Color, set Color name to #000000 and Opacity to 180
37			747
38			748	Expected Result:
39			749	The background color of the Launcher is black, and the icons are still visible.
40			750	The Launcher must stay black when Dash or HUD are opened, and the color must
41			751	be persistent between sessions (logout/login).
42	734		752
43	=== modified file 'unity-shared/BGHash.cpp'
44	--- unity-shared/BGHash.cpp 2012-08-15 05:29:29 +0000
45	+++ unity-shared/BGHash.cpp 2012-09-03 00:09:22 +0000
46	@@ -46,17 +46,17 @@
47	46	{	46	{
48	47	override_color_ = color;	47	override_color_ = color;
49	48		48
51	49	if (override_color_.alpha)	49	RefreshColor();
52			50	}
53			51
54			52	void BGHash::RefreshColor()
55			53	{
56			54	if (override_color_.alpha > 0.0f)
57	50	{	55	{
58	51	TransitionToNewColor(override_color_);	56	TransitionToNewColor(override_color_);
59	52	return;	57	return;
60	53	}	58	}
61	54		59
62	55	RefreshColor();
63	56	}
64	57
65	58	void BGHash::RefreshColor()
66	59	{
67	60	Atom real_type;	60	Atom real_type;
68	61	gint result;	61	gint result;
69	62	gint real_format;	62	gint real_format;