Merge lp:~unity-team/unity/fixes-2011-04-14 into lp:unity

Proposed by Neil J. Patel on 2011-04-14
Status: Merged
Approved by: Mirco Müller on 2011-04-14
Approved revision: 1126
Merged at revision: 1138
Proposed branch: lp:~unity-team/unity/fixes-2011-04-14
Merge into: lp:unity
Diff against target: 158 lines (+44/-6) (has conflicts)
6 files modified
src/PanelMenuView.cpp (+18/-3)
src/PanelView.cpp (+2/-3)
src/PlacesEmptyView.cpp (+3/-0)
src/PlacesView.cpp (+15/-0)
src/PlacesView.h (+5/-0)
src/PluginAdapter.cpp (+1/-0)
Text conflict in src/PlacesView.cpp
Text conflict in src/PlacesView.h
To merge this branch: bzr merge lp:~unity-team/unity/fixes-2011-04-14
Reviewer Review Type Date Requested Status
Mirco Müller (community) 2011-04-14 Approve on 2011-04-14
Review via email: mp+57688@code.launchpad.net

Description of the change

Bugs linked

To post a comment you must log in.
Mirco Müller (macslow) wrote :

Approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Launcher.cpp'
2=== modified file 'src/PanelMenuView.cpp'
3--- src/PanelMenuView.cpp 2011-04-12 14:34:08 +0000
4+++ src/PanelMenuView.cpp 2011-04-14 14:06:55 +0000
5@@ -311,7 +311,18 @@
6 }
7 else
8 {
9- if ((_is_inside || _last_active_view || _show_now_activated) && _entries.size ())
10+ bool have_valid_entries = false;
11+ std::vector<PanelIndicatorObjectEntryView *>::iterator it, eit = _entries.end ();
12+
13+ for (it = _entries.begin (); it != eit; ++it)
14+ {
15+ IndicatorObjectEntryProxy *proxy = (*it)->_proxy;
16+
17+ if (proxy->icon_visible || proxy->label_visible)
18+ have_valid_entries = true;
19+ }
20+
21+ if ((_is_inside || _last_active_view || _show_now_activated) && have_valid_entries)
22 {
23 if (_gradient_texture == NULL)
24 {
25@@ -683,7 +694,7 @@
26 PanelMenuView::OnEntryRemoved(IndicatorObjectEntryProxy *proxy)
27 {
28 std::vector<PanelIndicatorObjectEntryView *>::iterator it;
29-
30+
31 for (it = _entries.begin(); it != _entries.end(); it++)
32 {
33 PanelIndicatorObjectEntryView *view = static_cast<PanelIndicatorObjectEntryView *> (*it);
34@@ -721,6 +732,7 @@
35 PanelMenuView::OnActiveWindowChanged (BamfView *old_view,
36 BamfView *new_view)
37 {
38+ _show_now_activated = false;
39 _is_maximized = false;
40 _active_xid = 0;
41 if (_active_moved_id)
42@@ -734,7 +746,10 @@
43 _is_maximized = WindowManager::Default ()->IsWindowMaximized (xid);
44 nux::Geometry geo = WindowManager::Default ()->GetWindowGeometry (xid);
45
46- _we_control_active = UScreen::GetDefault ()->GetMonitorGeometry (_monitor).IsPointInside (geo.x + (geo.width/2), geo.y);
47+ if (bamf_window_get_window_type (window) == BAMF_WINDOW_DESKTOP)
48+ _we_control_active = true;
49+ else
50+ _we_control_active = UScreen::GetDefault ()->GetMonitorGeometry (_monitor).IsPointInside (geo.x + (geo.width/2), geo.y);
51
52 if (_decor_map.find (xid) == _decor_map.end ())
53 {
54
55=== modified file 'src/PanelView.cpp'
56--- src/PanelView.cpp 2011-04-06 17:53:41 +0000
57+++ src/PanelView.cpp 2011-04-14 14:06:55 +0000
58@@ -127,6 +127,8 @@
59 void
60 PanelView::Draw (nux::GraphicsEngine& GfxContext, bool force_draw)
61 {
62+ UpdateBackground ();
63+
64 GfxContext.PushClippingRectangle (GetGeometry() );
65
66 gPainter.PushDrawLayer (GfxContext, GetGeometry (), _bg_layer);
67@@ -164,9 +166,6 @@
68 long
69 PanelView::PostLayoutManagement (long LayoutResult)
70 {
71- // I'm imagining this is a good as time as any to update the background
72- UpdateBackground ();
73-
74 return nux::View::PostLayoutManagement (LayoutResult);
75 }
76
77
78=== modified file 'src/PlacesEmptyView.cpp'
79--- src/PlacesEmptyView.cpp 2011-03-20 18:15:16 +0000
80+++ src/PlacesEmptyView.cpp 2011-04-14 14:06:55 +0000
81@@ -25,9 +25,12 @@
82 PlacesEmptyView::PlacesEmptyView ()
83 : nux::View (NUX_TRACKER_LOCATION)
84 {
85+ PlacesStyle *style = PlacesStyle::GetDefault ();
86+
87 SetLayout (new nux::HLayout (NUX_TRACKER_LOCATION));
88
89 _text = new nux::StaticCairoText ("");
90+ _text->SetMaximumWidth (style->GetTileWidth () * style->GetDefaultNColumns ());
91 _text->SetTextEllipsize (nux::StaticCairoText::NUX_ELLIPSIZE_END);
92 _text->SetTextAlignment (nux::StaticCairoText::NUX_ALIGN_CENTRE);
93 _text->SetTextVerticalAlignment (nux::StaticCairoText::NUX_ALIGN_CENTRE);
94
95=== modified file 'src/PlacesHomeView.cpp'
96=== modified file 'src/PlacesView.cpp'
97--- src/PlacesView.cpp 2011-04-14 09:10:30 +0000
98+++ src/PlacesView.cpp 2011-04-14 14:06:55 +0000
99@@ -120,6 +120,7 @@
100
101 // Register for all the events
102 UBusServer *ubus = ubus_server_get_default ();
103+<<<<<<< TREE
104
105 // This is a nice time to Connect () the Places as it's hopefully fast enough to be avaiable
106 // by the time the user starts typing (home screen doesn't require initial connection)
107@@ -138,6 +139,20 @@
108 _ubus_handles[3] = ubus_server_register_interest (ubus, UBUS_PLACE_VIEW_QUEUE_DRAW,
109 (UBusCallback)&PlacesView::OnPlaceViewQueueDrawNeeded,
110 this);
111+=======
112+ _ubus_handles[0] = ubus_server_register_interest (ubus, UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
113+ (UBusCallback)place_entry_activate_request,
114+ this);
115+ _ubus_handles[1] = ubus_server_register_interest (ubus, UBUS_PLACE_VIEW_CLOSE_REQUEST,
116+ (UBusCallback)&PlacesView::CloseRequest,
117+ this);
118+ _ubus_handles[2] = ubus_server_register_interest (ubus, UBUS_PLACE_TILE_ACTIVATE_REQUEST,
119+ (UBusCallback)&PlacesView::OnResultActivated,
120+ this);
121+ _ubus_handles[3] = ubus_server_register_interest (ubus, UBUS_PLACE_VIEW_QUEUE_DRAW,
122+ (UBusCallback)&PlacesView::OnPlaceViewQueueDrawNeeded,
123+ this);
124+>>>>>>> MERGE-SOURCE
125
126 _icon_loader = IconLoader::GetDefault ();
127
128
129=== modified file 'src/PlacesView.h'
130--- src/PlacesView.h 2011-04-13 16:06:03 +0000
131+++ src/PlacesView.h 2011-04-14 14:06:55 +0000
132@@ -174,9 +174,14 @@
133 bool _pending_activation;
134
135 bool _search_empty;
136+<<<<<<< TREE
137 bool _places_connected;
138 guint _home_button_hover;
139 guint _ubus_handles[4];
140+=======
141+
142+ guint _ubus_handles[4];
143+>>>>>>> MERGE-SOURCE
144 };
145
146 #endif // PANEL_HOME_BUTTON_H
147
148=== modified file 'src/PluginAdapter.cpp'
149--- src/PluginAdapter.cpp 2011-04-08 17:53:28 +0000
150+++ src/PluginAdapter.cpp 2011-04-14 14:06:55 +0000
151@@ -393,6 +393,7 @@
152 for (CompWindow *sibling = window->next; sibling != NULL; sibling = sibling->next)
153 {
154 if (sibling->defaultViewport () == window_vp
155+ && !sibling->minimized ()
156 && (sibling->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
157 return true;
158 }