Unity

Merge lp:~mrasmus/unity/unity.fix-691812 into lp:unity

  1. unity.fix-691812
  2. Merge into trunk
Proposed by Matthew Rasmus
Status: Merged
Merged at revision: 727
Proposed branch: lp:~mrasmus/unity/unity.fix-691812
Merge into: lp:unity
Diff against target: 16 lines (+5/-1)
1 file modified
src/PanelMenuView.cpp (+5/-1)
To merge this branch: bzr merge lp:~mrasmus/unity/unity.fix-691812
Reviewer Review Type Date Requested Status
Jason Smith (community) Approve
Review via email: mp+44155@code.launchpad.net

Description of the change

I haven't used std::map until today, so I'm not sure if there's a better way to do this..

To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) wrote :

+1 seems to work

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/PanelMenuView.cpp'
2--- src/PanelMenuView.cpp 2010-12-17 10:37:49 +0000
3+++ src/PanelMenuView.cpp 2010-12-19 01:14:53 +0000
4@@ -540,7 +540,11 @@
5 if (BAMF_IS_WINDOW (new_view))
6 {
7 BamfWindow *window = BAMF_WINDOW (new_view);
8- _is_maximized = WindowManager::Default ()->IsWindowMaximized (bamf_window_get_xid (window));
9+ guint32 xid = bamf_window_get_xid (window);
10+ _is_maximized = WindowManager::Default ()->IsWindowMaximized (xid);
11+
12+ if (_decor_map.find (xid) == _decor_map.end ())
13+ _decor_map[xid] = true;
14 }
15
16 Refresh ();