applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "shell: ensure the background and foreground colours are consistent"

Browse source 
This actually breaks unfocused windows theming and doesn't seem to be needed
otherwise.

This reverts commit aac24399f8.

https://bugzilla.gnome.org/show_bug.cgi?id=666723
This commit is contained in:
Rui Matos 2011-12-22 16:14:26 +00:00
parent 0cc4e93269
commit c812b9ac16
2 changed files with 0 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
shell/cc-shell-category-view.c
View file

@ -114,28 +114,6 @@ cc_shell_category_view_finalize (GObject *object)
G_OBJECT_CLASS (cc_shell_category_view_parent_class)->finalize (object); G_OBJECT_CLASS (cc_shell_category_view_parent_class)->finalize (object);
} }
static void
label_style_set_cb (GtkWidget *widget,
GtkStyle *old_style,
gpointer user_data)
{
GtkStyle *style;
/* "base" colours are used for the background inside CcShellCategoryView,
* so set the labels to use the "text" colors */
g_signal_handlers_block_by_func (widget, label_style_set_cb, NULL);
style = gtk_widget_get_style (widget);
gtk_widget_modify_fg (widget, GTK_STATE_NORMAL,
&style->text[GTK_STATE_NORMAL]);
g_signal_handlers_unblock_by_func (widget, label_style_set_cb, NULL);
}
static void static void
cc_shell_category_view_constructed (GObject *object) cc_shell_category_view_constructed (GObject *object)
{ {
@ -174,9 +152,6 @@ cc_shell_category_view_constructed (GObject *object)
pango_attr_list_unref (attrs); pango_attr_list_unref (attrs);
gtk_frame_set_label_widget (GTK_FRAME (object), label); gtk_frame_set_label_widget (GTK_FRAME (object), label);
gtk_widget_show (label); gtk_widget_show (label);
g_signal_connect (label, "style-set", G_CALLBACK (label_style_set_cb),
NULL);
} }
/* add the iconview to the vbox */ /* add the iconview to the vbox */
@ -189,35 +164,11 @@ cc_shell_category_view_constructed (GObject *object)
priv->iconview = iconview; priv->iconview = iconview;
} }
static gboolean
cc_shell_category_view_draw (GtkWidget *widget,
cairo_t *cr)
{
GtkStyle *style;
GtkStateType state;
GtkAllocation allocation;
style = gtk_widget_get_style (widget);
state = gtk_widget_get_state (widget);
gtk_widget_get_allocation (widget, &allocation);
cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
gdk_cairo_set_source_color (cr, &style->base[state]);
cairo_fill (cr);
GTK_WIDGET_CLASS (cc_shell_category_view_parent_class)->draw (widget, cr);
return FALSE;
}
static void static void
cc_shell_category_view_class_init (CcShellCategoryViewClass *klass) cc_shell_category_view_class_init (CcShellCategoryViewClass *klass)
{ {
GParamSpec *pspec; GParamSpec *pspec;
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
g_type_class_add_private (klass, sizeof (CcShellCategoryViewPrivate)); g_type_class_add_private (klass, sizeof (CcShellCategoryViewPrivate));
@ -227,8 +178,6 @@ cc_shell_category_view_class_init (CcShellCategoryViewClass *klass)
object_class->finalize = cc_shell_category_view_finalize; object_class->finalize = cc_shell_category_view_finalize;
object_class->constructed = cc_shell_category_view_constructed; object_class->constructed = cc_shell_category_view_constructed;
widget_class->draw = cc_shell_category_view_draw;
pspec = g_param_spec_string ("name", pspec = g_param_spec_string ("name",
"Name", "Name",
"Name of the category", "Name of the category",

25
shell/gnome-control-center.c
View file

@ -1008,25 +1008,6 @@ gnome_control_center_class_init (GnomeControlCenterClass *klass)
shell_class->get_toplevel = _shell_get_toplevel; shell_class->get_toplevel = _shell_get_toplevel;
} }
static void
viewport_style_set_cb (GtkWidget *widget,
GtkStyle *old_style,
gpointer user_data)
{
GtkStyle *style;
/* use "base" colours inside the viewport */
g_signal_handlers_block_by_func (widget, viewport_style_set_cb, NULL);
style = gtk_widget_get_style (widget);
gtk_widget_modify_bg (widget, GTK_STATE_NORMAL,
&style->base[GTK_STATE_NORMAL]);
g_signal_handlers_unblock_by_func (widget, viewport_style_set_cb, NULL);
}
static gboolean static gboolean
window_key_press_event (GtkWidget *win, window_key_press_event (GtkWidget *win,
GdkEventKey *event, GdkEventKey *event,
@ -1070,7 +1051,6 @@ window_key_press_event (GtkWidget *win,
static void static void
gnome_control_center_init (GnomeControlCenter *self) gnome_control_center_init (GnomeControlCenter *self)
{ {
GtkWidget *widget;
GError *err = NULL; GError *err = NULL;
GnomeControlCenterPrivate *priv; GnomeControlCenterPrivate *priv;
@ -1095,11 +1075,6 @@ gnome_control_center_init (GnomeControlCenter *self)
priv->notebook = W (priv->builder, "notebook"); priv->notebook = W (priv->builder, "notebook");
priv->scrolled_window = W (priv->builder, "scrolledwindow1"); priv->scrolled_window = W (priv->builder, "scrolledwindow1");
widget = W (priv->builder, "viewport");
g_signal_connect (widget, "style-set", G_CALLBACK (viewport_style_set_cb),
NULL);
gtk_widget_set_size_request (priv->scrolled_window, FIXED_WIDTH, -1); gtk_widget_set_size_request (priv->scrolled_window, FIXED_WIDTH, -1);
priv->main_vbox = W (priv->builder, "main-vbox"); priv->main_vbox = W (priv->builder, "main-vbox");
g_signal_connect (priv->notebook, "switch-page", g_signal_connect (priv->notebook, "switch-page",