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

Proposed by Tom Beckmann
Status: Merged
Merged at revision: 311
Proposed branch: lp:~tombeckmann/switchboard/white-bg
Merge into: lp:~elementary-pantheon/switchboard/switchboard
Diff against target: 33 lines (+9/-0)
1 file modified
Switchboard/switchboard-app.vala (+9/-0)
To merge this branch: bzr merge lp:~tombeckmann/switchboard/white-bg
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+125862@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cassidy James Blaede (cassidyjames) wrote :

Was there a bug report or design linked to this?

lp:~tombeckmann/switchboard/white-bg updated
311. By Tom Beckmann

Make switchboard's background white

Revision history for this message
Cody Garver (codygarver) wrote :

Yes Cassidy, jump on IRC.

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 17:33:26 +0000
+++ Switchboard/switchboard-app.vala 2012-09-22 20:16:18 +0000
@@ -115,6 +115,7 @@
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);
118119
119 scrollable_view = new Gtk.ScrolledWindow (null, null);120 scrollable_view = new Gtk.ScrolledWindow (null, null);
120121
@@ -123,6 +124,7 @@
123 grid.set_hexpand (true);124 grid.set_hexpand (true);
124 grid.set_vexpand (true);125 grid.set_vexpand (true);
125 grid.attach (toolbar, 0, 0, 1, 1);126 grid.attach (toolbar, 0, 0, 1, 1);
127 grid.draw.connect (draw_white);
126 toolbar.set_hexpand (true);128 toolbar.set_hexpand (true);
127129
128 alert_view = new Granite.Widgets.EmbeddedAlert ();130 alert_view = new Granite.Widgets.EmbeddedAlert ();
@@ -196,6 +198,13 @@
196 }198 }
197 }199 }
198 200
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
199 void shut_down () {208 void shut_down () {
200 plug_closed ();209 plug_closed ();
201 }210 }

Subscribers

People subscribed via source and target branches

to all changes: