Unity Control Center

Merge lp:~larsu/unity-control-center/dont-use-view-style-class into lp:unity-control-center

  1. dont-use-view-style-class
  2. Merge into trunk
Proposed by Lars Karlitski
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 12748
Merged at revision: 12749
Proposed branch: lp:~larsu/unity-control-center/dont-use-view-style-class
Merge into: lp:unity-control-center
Diff against target: 27 lines (+3/-3)
2 files modified
shell/cc-shell-item-view.c (+3/-0)
shell/shell.ui (+0/-3)
To merge this branch: bzr merge lp:~larsu/unity-control-center/dont-use-view-style-class
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+210597@code.launchpad.net

Commit message

Don't use .view style class for the item view

Description of the change

Don't use .view style class for the item view

Ambiance styles widgets that have the "view" css class set (mostly tree- and iconviews) with a white background. Matthew suggested that white backgrounds are only for user-editable regions, which the system settings panel is not.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:12748
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/67/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/68

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/67/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

Nice to get the color back, I didn't really get used to the white background ;-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shell/cc-shell-item-view.c'
2--- shell/cc-shell-item-view.c 2011-07-14 14:24:03 +0000
3+++ shell/cc-shell-item-view.c 2014-03-12 12:56:38 +0000
4@@ -199,6 +199,9 @@
5 {
6 self->priv = SHELL_ITEM_VIEW_PRIVATE (self);
7
8+ /* Style like a normal widget instead of like an icon view */
9+ gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (self)), "view");
10+
11 g_object_set (self, "margin", 0, NULL);
12 g_signal_connect (self, "item-activated",
13 G_CALLBACK (iconview_item_activated_cb), self);
14
15=== modified file 'shell/shell.ui'
16--- shell/shell.ui 2014-02-26 12:28:12 +0000
17+++ shell/shell.ui 2014-03-12 12:56:38 +0000
18@@ -96,9 +96,6 @@
19 <property name="visible">True</property>
20 <property name="resize_mode">queue</property>
21 <property name="shadow_type">none</property>
22- <style>
23- <class name="view" />
24- </style>
25 <child>
26 <object class="GtkVBox" id="main-vbox">
27 <property name="visible">True</property>

Subscribers

People subscribed via source and target branches