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
=== modified file 'CMakeLists.txt'
=== modified file 'plugins/unityshell/resources/dash-widgets.json'
--- plugins/unityshell/resources/dash-widgets.json 2011-09-15 07:31:40 +0000
+++ plugins/unityshell/resources/dash-widgets.json 2011-10-11 15:05:21 +0000
@@ -47,7 +47,7 @@
47 "text-color" : ["#ffffff", "#ffffff", "#ffffff", "#ffffff", "#ffffff"],47 "text-color" : ["#ffffff", "#ffffff", "#ffffff", "#ffffff", "#ffffff"],
48 "text-opacity" : [ 1.0, 1.0, 1.0, 1.0, 1.0], 48 "text-opacity" : [ 1.0, 1.0, 1.0, 1.0, 1.0],
49 "fill-color" : ["#FFFFFF", "#000000", "#ffffff", "#000000", "#000000"],49 "fill-color" : ["#FFFFFF", "#000000", "#ffffff", "#000000", "#000000"],
50 "fill-opacity" : [ 0.5, 0.0, 0.25, 0.0, 0.0],50 "fill-opacity" : [ 0.25, 0.0, 0.25, 0.0, 0.0],
51 "overlay-opacity": [ 0.1, 0.1, 0.1, 0.0, 0.0],51 "overlay-opacity": [ 0.1, 0.1, 0.1, 0.0, 0.0],
52 "overlay-mode" : [ "normal", "normal", "normal", "normal", "normal"],52 "overlay-mode" : [ "normal", "normal", "normal", "normal", "normal"],
53 "blur-size" : [ 1, 1, 1, 0, 0]},53 "blur-size" : [ 1, 1, 1, 0, 0]},
5454
=== modified file 'plugins/unityshell/src/DashSearchBar.cpp'
--- plugins/unityshell/src/DashSearchBar.cpp 2011-10-10 05:50:19 +0000
+++ plugins/unityshell/src/DashSearchBar.cpp 2011-10-11 15:05:21 +0000
@@ -105,7 +105,13 @@
105 show_filters_->SetCanFocus(true);105 show_filters_->SetCanFocus(true);
106 show_filters_->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_LEFT);106 show_filters_->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_LEFT);
107 show_filters_->mouse_click.connect([&] (int x, int y, unsigned long b, unsigned long k) { showing_filters = !showing_filters; });107 show_filters_->mouse_click.connect([&] (int x, int y, unsigned long b, unsigned long k) { showing_filters = !showing_filters; });
108 layout_->AddView(show_filters_, 0, nux::MINOR_POSITION_RIGHT, nux::MINOR_SIZE_FIX);108
109 nux::Layout *filter_layout = new nux::HLayout();
110 filter_layout->SetHorizontalExternalMargin(12);
111 filter_layout->AddLayout(new nux::SpaceLayout(0, 10000, 0, 1), 1);
112 filter_layout->AddView(show_filters_, 0, nux::MINOR_POSITION_RIGHT);
113
114 layout_->AddView(filter_layout, 1, nux::MINOR_POSITION_RIGHT, nux::MINOR_SIZE_FIX);
109115
110 sig_manager_.Add(new Signal<void, GtkSettings*, GParamSpec*>116 sig_manager_.Add(new Signal<void, GtkSettings*, GParamSpec*>
111 (gtk_settings_get_default(),117 (gtk_settings_get_default(),
112118
=== modified file 'plugins/unityshell/src/FilterBar.cpp'
--- plugins/unityshell/src/FilterBar.cpp 2011-09-12 23:38:13 +0000
+++ plugins/unityshell/src/FilterBar.cpp 2011-10-11 15:05:21 +0000
@@ -46,6 +46,7 @@
46 void FilterBar::Init () {46 void FilterBar::Init () {
47 nux::Layout *layout = new nux::VLayout (NUX_TRACKER_LOCATION);47 nux::Layout *layout = new nux::VLayout (NUX_TRACKER_LOCATION);
48 layout->SetVerticalInternalMargin(12);48 layout->SetVerticalInternalMargin(12);
49 layout->SetVerticalExternalMargin(0);
49 SetLayout (layout);50 SetLayout (layout);
50 }51 }
5152
5253
=== modified file 'plugins/unityshell/src/FilterExpanderLabel.cpp'
--- plugins/unityshell/src/FilterExpanderLabel.cpp 2011-09-15 07:31:40 +0000
+++ plugins/unityshell/src/FilterExpanderLabel.cpp 2011-10-11 15:05:21 +0000
@@ -26,6 +26,7 @@
2626
27#include "FilterBasicButton.h"27#include "FilterBasicButton.h"
28#include "FilterExpanderLabel.h"28#include "FilterExpanderLabel.h"
29#include "PlacesStyle.h"
2930
30namespace unity {31namespace unity {
3132
@@ -56,6 +57,8 @@
5657
57 void FilterExpanderLabel::SetRightHandView (nux::View *view)58 void FilterExpanderLabel::SetRightHandView (nux::View *view)
58 {59 {
60 view->SetMaximumHeight(30);
61
59 right_hand_contents_ = view;62 right_hand_contents_ = view;
60 top_bar_layout_->AddView(right_hand_contents_, 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);63 top_bar_layout_->AddView(right_hand_contents_, 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
61 }64 }
@@ -71,9 +74,11 @@
7174
72 void FilterExpanderLabel::BuildLayout ()75 void FilterExpanderLabel::BuildLayout ()
73 {76 {
77 PlacesStyle *style = PlacesStyle::GetDefault();
78
74 layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);79 layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
75 top_bar_layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);80 top_bar_layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
7681
77 cairo_label_ = new nux::StaticText(label_.c_str(), NUX_TRACKER_LOCATION);82 cairo_label_ = new nux::StaticText(label_.c_str(), NUX_TRACKER_LOCATION);
78 cairo_label_->SetFontName("Ubuntu 10");83 cairo_label_->SetFontName("Ubuntu 10");
79 cairo_label_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 1.0f));84 cairo_label_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
@@ -88,9 +93,11 @@
8893
89 top_bar_layout_->AddView (cairo_label_, 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);94 top_bar_layout_->AddView (cairo_label_, 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
90 top_bar_layout_->AddSpace(1, 1);95 top_bar_layout_->AddSpace(1, 1);
96
97 top_bar_layout_->SetMaximumWidth((style->GetTileWidth() -12)*2+10);
9198
92 layout_->AddLayout (top_bar_layout_, 0);99 layout_->AddLayout (top_bar_layout_, 0, nux::MINOR_POSITION_LEFT);
93 layout_->SetVerticalInternalMargin(12);100 layout_->SetVerticalInternalMargin(0);
94101
95 SetLayout(layout_);102 SetLayout(layout_);
96103
97104
=== modified file 'plugins/unityshell/src/FilterGenreWidget.cpp'
--- plugins/unityshell/src/FilterGenreWidget.cpp 2011-09-12 23:38:13 +0000
+++ plugins/unityshell/src/FilterGenreWidget.cpp 2011-10-11 15:05:21 +0000
@@ -61,7 +61,7 @@
61 genre_layout_->SetVerticalExternalMargin (12);61 genre_layout_->SetVerticalExternalMargin (12);
62 genre_layout_->SetHorizontalInternalMargin (10);62 genre_layout_->SetHorizontalInternalMargin (10);
63 genre_layout_->EnablePartialVisibility (false);63 genre_layout_->EnablePartialVisibility (false);
64 genre_layout_->SetChildrenSize (style->GetTileWidth() - 12, 35);64 genre_layout_->SetChildrenSize (style->GetTileWidth() - 12, 32);
6565
66 SetRightHandView(all_button_);66 SetRightHandView(all_button_);
67 SetContents(genre_layout_);67 SetContents(genre_layout_);
6868
=== modified file 'plugins/unityshell/src/FilterMultiRangeButton.cpp'
--- plugins/unityshell/src/FilterMultiRangeButton.cpp 2011-09-29 07:37:54 +0000
+++ plugins/unityshell/src/FilterMultiRangeButton.cpp 2011-10-11 15:05:21 +0000
@@ -124,7 +124,7 @@
124 normal_ = new nux::CairoWrapper(GetGeometry(), sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::State::NUX_STATE_NORMAL));124 normal_ = new nux::CairoWrapper(GetGeometry(), sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::State::NUX_STATE_NORMAL));
125 }125 }
126126
127 //SetMinimumHeight(32);127 SetMinimumHeight(32);
128 }128 }
129129
130 void FilterMultiRangeButton::RedrawTheme (nux::Geometry const& geom, cairo_t *cr, nux::State faked_state)130 void FilterMultiRangeButton::RedrawTheme (nux::Geometry const& geom, cairo_t *cr, nux::State faked_state)
131131
=== modified file 'plugins/unityshell/src/LensView.cpp'
--- plugins/unityshell/src/LensView.cpp 2011-09-30 03:49:12 +0000
+++ plugins/unityshell/src/LensView.cpp 2011-10-11 15:05:21 +0000
@@ -144,6 +144,8 @@
144void LensView::SetupViews()144void LensView::SetupViews()
145{145{
146 layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);146 layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
147
148 layout_->SetHorizontalExternalMargin(8);
147149
148 scroll_view_ = new LensScrollView(new PlacesVScrollBar(NUX_TRACKER_LOCATION),150 scroll_view_ = new LensScrollView(new PlacesVScrollBar(NUX_TRACKER_LOCATION),
149 NUX_TRACKER_LOCATION);151 NUX_TRACKER_LOCATION);
150152
=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
=== modified file 'plugins/unityshell/src/PluginAdapter.cpp'
--- plugins/unityshell/src/PluginAdapter.cpp 2011-10-07 02:40:38 +0000
+++ plugins/unityshell/src/PluginAdapter.cpp 2011-10-11 15:05:21 +0000
@@ -780,11 +780,14 @@
780780
781 hints_atom = XInternAtom(display, _XA_MOTIF_WM_HINTS, false);781 hints_atom = XInternAtom(display, _XA_MOTIF_WM_HINTS, false);
782782
783 XGetWindowProperty(display,783 if (XGetWindowProperty(display,
784 xid,784 xid,
785 hints_atom, 0, sizeof(MotifWmHints) / sizeof(long),785 hints_atom, 0, sizeof(MotifWmHints) / sizeof(long),
786 False, AnyPropertyType, &type, &format, &nitems,786 False, AnyPropertyType, &type, &format, &nitems,
787 &bytes_after, (guchar**)&data);787 &bytes_after, (guchar**)&data) != Success)
788 {
789 return;
790 }
788791
789 if (type != hints_atom || !data)792 if (type != hints_atom || !data)
790 {793 {