Merge lp:~tombeckmann/switchboard/revert-white-bg into lp:~elementary-pantheon/switchboard/switchboard

Proposed by Tom Beckmann
Status: Merged
Merged at revision: 313
Proposed branch: lp:~tombeckmann/switchboard/revert-white-bg
Merge into: lp:~elementary-pantheon/switchboard/switchboard
Diff against target: 33 lines (+0/-9)
1 file modified
Switchboard/switchboard-app.vala (+0/-9)
To merge this branch: bzr merge lp:~tombeckmann/switchboard/revert-white-bg
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+125892@code.launchpad.net

Description of the change

Dan doesnt like white switchboard.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Switchboard/switchboard-app.vala'
--- Switchboard/switchboard-app.vala 2012-09-22 20:12:56 +0000
+++ Switchboard/switchboard-app.vala 2012-09-23 20:12:20 +0000
@@ -115,7 +115,6 @@
115 category_view = new Switchboard.CategoryView ();115 category_view = new Switchboard.CategoryView ();
116 category_view.plug_selected.connect ((title, executable, @extern) => load_plug (title, executable, @extern));116 category_view.plug_selected.connect ((title, executable, @extern) => load_plug (title, executable, @extern));
117 category_view.margin_top = 12;117 category_view.margin_top = 12;
118 category_view.draw.connect (draw_white);
119118
120 scrollable_view = new Gtk.ScrolledWindow (null, null);119 scrollable_view = new Gtk.ScrolledWindow (null, null);
121120
@@ -124,7 +123,6 @@
124 grid.set_hexpand (true);123 grid.set_hexpand (true);
125 grid.set_vexpand (true);124 grid.set_vexpand (true);
126 grid.attach (toolbar, 0, 0, 1, 1);125 grid.attach (toolbar, 0, 0, 1, 1);
127 grid.draw.connect (draw_white);
128 toolbar.set_hexpand (true);126 toolbar.set_hexpand (true);
129127
130 alert_view = new Granite.Widgets.EmbeddedAlert ();128 alert_view = new Granite.Widgets.EmbeddedAlert ();
@@ -198,13 +196,6 @@
198 }196 }
199 }197 }
200 198
201 bool draw_white (Cairo.Context cr) {
202 cr.rectangle (0, 0, category_view.get_allocated_width (), category_view.get_allocated_height ());
203 cr.set_source_rgb (1, 1, 1);
204 cr.fill ();
205 return false;
206 }
207
208 void shut_down () {199 void shut_down () {
209 plug_closed ();200 plug_closed ();
210 }201 }

Subscribers

People subscribed via source and target branches

to all changes: