Merge lp:~mterry/unity-greeter/no-dragging into lp:unity-greeter

Proposed by Michael Terry
Status: Merged
Merged at revision: 322
Proposed branch: lp:~mterry/unity-greeter/no-dragging
Merge into: lp:unity-greeter
Diff against target: 34 lines (+16/-0)
2 files modified
NEWS (+4/-0)
src/menubar.vala (+12/-0)
To merge this branch: bzr merge lp:~mterry/unity-greeter/no-dragging
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Review via email: mp+94447@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2012-02-22 13:41:24 +0000
+++ NEWS 2012-02-23 20:33:18 +0000
@@ -1,3 +1,7 @@
1Overview of changes in unity-greeter 0.2.5
2
3 * Don't allow dragging the window by the top bar
4
1Overview of changes in unity-greeter 0.2.45Overview of changes in unity-greeter 0.2.4
26
3 * Don't crash when all monitors are the same size7 * Don't crash when all monitors are the same size
48
=== modified file 'src/menubar.vala'
--- src/menubar.vala 2012-02-15 09:21:45 +0000
+++ src/menubar.vala 2012-02-23 20:33:18 +0000
@@ -142,6 +142,18 @@
142 label.ensure_style ();142 label.ensure_style ();
143 label.modify_fg (Gtk.StateType.INSENSITIVE, label.get_style ().fg[Gtk.StateType.NORMAL]);143 label.modify_fg (Gtk.StateType.INSENSITIVE, label.get_style ().fg[Gtk.StateType.NORMAL]);
144144
145 /* Prevent dragging the window by the menubar */
146 try
147 {
148 var style = new Gtk.CssProvider ();
149 style.load_from_data ("* {-GtkWidget-window-dragging: false;}", -1);
150 get_style_context ().add_provider (style, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
151 }
152 catch (Error e)
153 {
154 debug ("Internal error loading session chooser style: %s", e.message);
155 }
156
145 setup_indicators ();157 setup_indicators ();
146158
147 set_size_request (-1, 32);159 set_size_request (-1, 32);

Subscribers

People subscribed via source and target branches