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

background: Fix broken preview

Browse source 
The style wasn't set properly on startup, and then incorrectly
applied to the preview because the numbering of the items in
the style-liststore doesn't match the GDesktopBackgroundStyle
enum 1-to-1.
This commit is contained in:
Bastien Nocera 2010-12-14 17:27:09 +00:00
parent 98a48ebb6b
commit adfe6ef8fc
1 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

43
panels/background/cc-background-panel.c
View file

@ -279,6 +279,36 @@ copy_finished_cb (GObject *source_object,
g_object_unref (panel); g_object_unref (panel);
} }
static void
select_style (GtkComboBox *box,
GDesktopBackgroundStyle new_style)
{
GtkTreeModel *model;
GtkTreeIter iter;
gboolean cont;
model = gtk_combo_box_get_model (box);
cont = gtk_tree_model_get_iter_first (model, &iter);
while (cont != FALSE)
{
GDesktopBackgroundStyle style;
gtk_tree_model_get (model, &iter,
1, &style,
-1);
if (style == new_style)
{
gtk_combo_box_set_active_iter (box, &iter);
break;
}
cont = gtk_tree_model_iter_next (model, &iter);
}
if (cont == FALSE)
gtk_combo_box_set_active (box, -1);
}
static void static void
update_preview (CcBackgroundPanelPrivate *priv, update_preview (CcBackgroundPanelPrivate *priv,
GnomeWPItem *item, GnomeWPItem *item,
@ -296,8 +326,6 @@ update_preview (CcBackgroundPanelPrivate *priv,
gdk_color_free (priv->current_background->scolor); gdk_color_free (priv->current_background->scolor);
priv->current_background->scolor = gdk_color_copy (item->scolor); priv->current_background->scolor = gdk_color_copy (item->scolor);
g_free (priv->current_background->filename); g_free (priv->current_background->filename);
priv->current_background->filename = g_strdup (item->filename); priv->current_background->filename = g_strdup (item->filename);
@ -305,6 +333,9 @@ update_preview (CcBackgroundPanelPrivate *priv,
priv->current_background->name = g_strdup (item->name); priv->current_background->name = g_strdup (item->name);
priv->current_background->options = item->options; priv->current_background->options = item->options;
priv->current_background->shade_type = item->shade_type;
gnome_wp_item_ensure_gnome_bg (priv->current_background);
} }
@ -322,8 +353,8 @@ update_preview (CcBackgroundPanelPrivate *priv,
gtk_color_button_set_color (GTK_COLOR_BUTTON (WID ("style-color")), gtk_color_button_set_color (GTK_COLOR_BUTTON (WID ("style-color")),
priv->current_background->pcolor); priv->current_background->pcolor);
gtk_combo_box_set_active (GTK_COMBO_BOX (WID ("style-combobox")), select_style (GTK_COMBO_BOX (WID ("style-combobox")),
priv->current_background->options); priv->current_background->options);
} }
if (redraw_preview) if (redraw_preview)
@ -544,7 +575,7 @@ style_changed_cb (GtkComboBox *box,
CcBackgroundPanelPrivate *priv = panel->priv; CcBackgroundPanelPrivate *priv = panel->priv;
GtkTreeModel *model; GtkTreeModel *model;
GtkTreeIter iter; GtkTreeIter iter;
gint value; GDesktopBackgroundStyle value;
if (!gtk_combo_box_get_active_iter (box, &iter)) if (!gtk_combo_box_get_active_iter (box, &iter))
{ {
@ -558,7 +589,7 @@ style_changed_cb (GtkComboBox *box,
g_settings_set_enum (priv->settings, WP_OPTIONS_KEY, value); g_settings_set_enum (priv->settings, WP_OPTIONS_KEY, value);
if (priv->current_background) if (priv->current_background)
priv->current_background->options = gtk_combo_box_get_active (box); priv->current_background->options = value;
update_preview (priv, NULL, TRUE); update_preview (priv, NULL, TRUE);
} }