Unity

Merge lp:~manuel-nicetto/unity/bug-733740 into lp:unity

  1. bug-733740
  2. Merge into trunk
Proposed by Manuel Nicetto
Status: Merged
Approved by: Mirco Müller
Approved revision: no longer in the source branch.
Merged at revision: 1199
Proposed branch: lp:~manuel-nicetto/unity/bug-733740
Merge into: lp:unity
Diff against target: 42 lines (+10/-0)
2 files modified
src/PanelIndicatorObjectEntryView.cpp (+9/-0)
src/PanelIndicatorObjectEntryView.h (+1/-0)
To merge this branch: bzr merge lp:~manuel-nicetto/unity/bug-733740
Reviewer Review Type Date Requested Status
Mirco Müller (community) Approve
Review via email: mp+59715@code.launchpad.net

Description of the change

Fixed inactive menus becomes brighter on sub-sequent clicks LP: #733740

To post a comment you must log in.
Revision history for this message
Mirco Müller (macslow) wrote :

Code is ok, works as advertised, fixes said bug... approved!

review: Approve
Revision history for this message
Mirco Müller (macslow) wrote :

Manuel, before we can merge your branch, you'll need to sign the contributor-agreement. Have a look here -> http://www.canonical.com/contributors

review: Needs Fixing
Revision history for this message
Mirco Müller (macslow) wrote :

I've contacted Manuel also via eMail.

Revision history for this message
Mirco Müller (macslow) wrote :

CA received.

Revision history for this message
Mirco Müller (macslow) wrote :

Approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/PanelIndicatorObjectEntryView.cpp'
2--- src/PanelIndicatorObjectEntryView.cpp 2011-04-15 14:51:38 +0000
3+++ src/PanelIndicatorObjectEntryView.cpp 2011-05-02 22:21:26 +0000
4@@ -49,6 +49,7 @@
5 _on_font_changed_connection = g_signal_connect (gtk_settings_get_default (), "notify::gtk-font-name", (GCallback) &PanelIndicatorObjectEntryView::OnFontChanged, this);
6
7 InputArea::OnMouseDown.connect (sigc::mem_fun (this, &PanelIndicatorObjectEntryView::OnMouseDown));
8+ InputArea::OnMouseUp.connect (sigc::mem_fun (this, &PanelIndicatorObjectEntryView::OnMouseUp));
9 InputArea::OnMouseWheel.connect (sigc::mem_fun (this, &PanelIndicatorObjectEntryView::OnMouseWheel));
10
11 _on_panelstyle_changed_connection = PanelStyle::GetDefault ()->changed.connect (sigc::mem_fun (this, &PanelIndicatorObjectEntryView::Refresh));
12@@ -82,10 +83,18 @@
13 GetAbsoluteGeometry ().y + PANEL_HEIGHT,
14 time (NULL),
15 nux::GetEventButton (button_flags));
16+ } else {
17+ Refresh();
18 }
19 }
20
21 void
22+PanelIndicatorObjectEntryView::OnMouseUp (int x, int y, long button_flags, long key_flags)
23+{
24+ Refresh();
25+}
26+
27+void
28 PanelIndicatorObjectEntryView::OnMouseWheel (int x, int y, int delta, unsigned long mouse_state, unsigned long key_state)
29 {
30 _proxy->Scroll (delta);
31
32=== modified file 'src/PanelIndicatorObjectEntryView.h'
33--- src/PanelIndicatorObjectEntryView.h 2011-04-15 14:51:38 +0000
34+++ src/PanelIndicatorObjectEntryView.h 2011-05-02 22:21:26 +0000
35@@ -40,6 +40,7 @@
36
37 void Refresh ();
38 void OnMouseDown (int x, int y, long button_flags, long key_flags);
39+ void OnMouseUp (int x, int y, long button_flags, long key_flags);
40 void OnMouseWheel (int x, int y, int delta, unsigned long mouse_state, unsigned long key_state);
41 void Activate ();
42 void OnActiveChanged (bool is_active);