Unity

Merge lp:~ricmm/unity/dashsearch-for-863240 into lp:unity

  1. dashsearch-for-863240
  2. Merge into trunk
Proposed by Ricardo Mendoza
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 1752
Proposed branch: lp:~ricmm/unity/dashsearch-for-863240
Merge into: lp:unity
Diff against target: 156 lines (+31/-12)
8 files modified
plugins/unityshell/resources/dash-widgets.json (+1/-1)
plugins/unityshell/src/DashSearchBar.cpp (+7/-1)
plugins/unityshell/src/FilterBar.cpp (+1/-0)
plugins/unityshell/src/FilterExpanderLabel.cpp (+10/-3)
plugins/unityshell/src/FilterGenreWidget.cpp (+1/-1)
plugins/unityshell/src/FilterMultiRangeButton.cpp (+1/-1)
plugins/unityshell/src/LensView.cpp (+2/-0)
plugins/unityshell/src/PluginAdapter.cpp (+8/-5)
To merge this branch: bzr merge lp:~ricmm/unity/dashsearch-for-863240
Reviewer Review Type Date Requested Status
Gord Allott (community) Approve
Review via email: mp+78992@code.launchpad.net

Description of the change

Work for bug #863240

To post a comment you must log in.
Revision history for this message
Gord Allott (gordallott) wrote :

On 11/10/11 16:00, Ricardo Mendoza wrote:
> Ricardo Mendoza has proposed merging lp:~ricmm/unity/dashsearch-for-863240 into lp:unity.
>
> Requested reviews:
> Unity Team (unity-team)
>
> For more details, see:
> https://code.launchpad.net/~ricmm/unity/dashsearch-for-863240/+merge/78992
>
> Work for bug #863240

Looks good to me

 review approve
 merge approved

--
Gordon Allott
Canonical Ltd.
27 Floor, Millbank Tower
London SW1P 4QP
www.canonical.com

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/2/console reported an error when processing this lp:~ricmm/unity/dashsearch-for-863240 branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2=== modified file 'plugins/unityshell/resources/dash-widgets.json'
3--- plugins/unityshell/resources/dash-widgets.json 2011-09-15 07:31:40 +0000
4+++ plugins/unityshell/resources/dash-widgets.json 2011-10-11 15:05:21 +0000
5@@ -47,7 +47,7 @@
6 "text-color" : ["#ffffff", "#ffffff", "#ffffff", "#ffffff", "#ffffff"],
7 "text-opacity" : [ 1.0, 1.0, 1.0, 1.0, 1.0],
8 "fill-color" : ["#FFFFFF", "#000000", "#ffffff", "#000000", "#000000"],
9- "fill-opacity" : [ 0.5, 0.0, 0.25, 0.0, 0.0],
10+ "fill-opacity" : [ 0.25, 0.0, 0.25, 0.0, 0.0],
11 "overlay-opacity": [ 0.1, 0.1, 0.1, 0.0, 0.0],
12 "overlay-mode" : [ "normal", "normal", "normal", "normal", "normal"],
13 "blur-size" : [ 1, 1, 1, 0, 0]},
14
15=== modified file 'plugins/unityshell/src/DashSearchBar.cpp'
16--- plugins/unityshell/src/DashSearchBar.cpp 2011-10-10 05:50:19 +0000
17+++ plugins/unityshell/src/DashSearchBar.cpp 2011-10-11 15:05:21 +0000
18@@ -105,7 +105,13 @@
19 show_filters_->SetCanFocus(true);
20 show_filters_->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_LEFT);
21 show_filters_->mouse_click.connect([&] (int x, int y, unsigned long b, unsigned long k) { showing_filters = !showing_filters; });
22- layout_->AddView(show_filters_, 0, nux::MINOR_POSITION_RIGHT, nux::MINOR_SIZE_FIX);
23+
24+ nux::Layout *filter_layout = new nux::HLayout();
25+ filter_layout->SetHorizontalExternalMargin(12);
26+ filter_layout->AddLayout(new nux::SpaceLayout(0, 10000, 0, 1), 1);
27+ filter_layout->AddView(show_filters_, 0, nux::MINOR_POSITION_RIGHT);
28+
29+ layout_->AddView(filter_layout, 1, nux::MINOR_POSITION_RIGHT, nux::MINOR_SIZE_FIX);
30
31 sig_manager_.Add(new Signal<void, GtkSettings*, GParamSpec*>
32 (gtk_settings_get_default(),
33
34=== modified file 'plugins/unityshell/src/FilterBar.cpp'
35--- plugins/unityshell/src/FilterBar.cpp 2011-09-12 23:38:13 +0000
36+++ plugins/unityshell/src/FilterBar.cpp 2011-10-11 15:05:21 +0000
37@@ -46,6 +46,7 @@
38 void FilterBar::Init () {
39 nux::Layout *layout = new nux::VLayout (NUX_TRACKER_LOCATION);
40 layout->SetVerticalInternalMargin(12);
41+ layout->SetVerticalExternalMargin(0);
42 SetLayout (layout);
43 }
44
45
46=== modified file 'plugins/unityshell/src/FilterExpanderLabel.cpp'
47--- plugins/unityshell/src/FilterExpanderLabel.cpp 2011-09-15 07:31:40 +0000
48+++ plugins/unityshell/src/FilterExpanderLabel.cpp 2011-10-11 15:05:21 +0000
49@@ -26,6 +26,7 @@
50
51 #include "FilterBasicButton.h"
52 #include "FilterExpanderLabel.h"
53+#include "PlacesStyle.h"
54
55 namespace unity {
56
57@@ -56,6 +57,8 @@
58
59 void FilterExpanderLabel::SetRightHandView (nux::View *view)
60 {
61+ view->SetMaximumHeight(30);
62+
63 right_hand_contents_ = view;
64 top_bar_layout_->AddView(right_hand_contents_, 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
65 }
66@@ -71,9 +74,11 @@
67
68 void FilterExpanderLabel::BuildLayout ()
69 {
70+ PlacesStyle *style = PlacesStyle::GetDefault();
71+
72 layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
73 top_bar_layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
74-
75+
76 cairo_label_ = new nux::StaticText(label_.c_str(), NUX_TRACKER_LOCATION);
77 cairo_label_->SetFontName("Ubuntu 10");
78 cairo_label_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
79@@ -88,9 +93,11 @@
80
81 top_bar_layout_->AddView (cairo_label_, 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
82 top_bar_layout_->AddSpace(1, 1);
83+
84+ top_bar_layout_->SetMaximumWidth((style->GetTileWidth() -12)*2+10);
85
86- layout_->AddLayout (top_bar_layout_, 0);
87- layout_->SetVerticalInternalMargin(12);
88+ layout_->AddLayout (top_bar_layout_, 0, nux::MINOR_POSITION_LEFT);
89+ layout_->SetVerticalInternalMargin(0);
90
91 SetLayout(layout_);
92
93
94=== modified file 'plugins/unityshell/src/FilterGenreWidget.cpp'
95--- plugins/unityshell/src/FilterGenreWidget.cpp 2011-09-12 23:38:13 +0000
96+++ plugins/unityshell/src/FilterGenreWidget.cpp 2011-10-11 15:05:21 +0000
97@@ -61,7 +61,7 @@
98 genre_layout_->SetVerticalExternalMargin (12);
99 genre_layout_->SetHorizontalInternalMargin (10);
100 genre_layout_->EnablePartialVisibility (false);
101- genre_layout_->SetChildrenSize (style->GetTileWidth() - 12, 35);
102+ genre_layout_->SetChildrenSize (style->GetTileWidth() - 12, 32);
103
104 SetRightHandView(all_button_);
105 SetContents(genre_layout_);
106
107=== modified file 'plugins/unityshell/src/FilterMultiRangeButton.cpp'
108--- plugins/unityshell/src/FilterMultiRangeButton.cpp 2011-09-29 07:37:54 +0000
109+++ plugins/unityshell/src/FilterMultiRangeButton.cpp 2011-10-11 15:05:21 +0000
110@@ -124,7 +124,7 @@
111 normal_ = new nux::CairoWrapper(GetGeometry(), sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::State::NUX_STATE_NORMAL));
112 }
113
114- //SetMinimumHeight(32);
115+ SetMinimumHeight(32);
116 }
117
118 void FilterMultiRangeButton::RedrawTheme (nux::Geometry const& geom, cairo_t *cr, nux::State faked_state)
119
120=== modified file 'plugins/unityshell/src/LensView.cpp'
121--- plugins/unityshell/src/LensView.cpp 2011-09-30 03:49:12 +0000
122+++ plugins/unityshell/src/LensView.cpp 2011-10-11 15:05:21 +0000
123@@ -144,6 +144,8 @@
124 void LensView::SetupViews()
125 {
126 layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
127+
128+ layout_->SetHorizontalExternalMargin(8);
129
130 scroll_view_ = new LensScrollView(new PlacesVScrollBar(NUX_TRACKER_LOCATION),
131 NUX_TRACKER_LOCATION);
132
133=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
134=== modified file 'plugins/unityshell/src/PluginAdapter.cpp'
135--- plugins/unityshell/src/PluginAdapter.cpp 2011-10-07 02:40:38 +0000
136+++ plugins/unityshell/src/PluginAdapter.cpp 2011-10-11 15:05:21 +0000
137@@ -780,11 +780,14 @@
138
139 hints_atom = XInternAtom(display, _XA_MOTIF_WM_HINTS, false);
140
141- XGetWindowProperty(display,
142- xid,
143- hints_atom, 0, sizeof(MotifWmHints) / sizeof(long),
144- False, AnyPropertyType, &type, &format, &nitems,
145- &bytes_after, (guchar**)&data);
146+ if (XGetWindowProperty(display,
147+ xid,
148+ hints_atom, 0, sizeof(MotifWmHints) / sizeof(long),
149+ False, AnyPropertyType, &type, &format, &nitems,
150+ &bytes_after, (guchar**)&data) != Success)
151+ {
152+ return;
153+ }
154
155 if (type != hints_atom || !data)
156 {