callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed brokeness introduced by the latest changes.

Browse Source 
2005-02-09  Sven Neumann  <sven@gimp.org>

	* app/display/gimpscalecombobox.c: fixed brokeness introduced by
	the latest changes.
This commit is contained in:
Sven Neumann
2005-02-09 02:23:13 +00:00
committed by Sven Neumann
parent 9ee865fa20
commit 4fac6a1f6b
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-02-09 Sven Neumann <sven@gimp.org>
* app/display/gimpscalecombobox.c: fixed brokeness introduced by
the latest changes.
2005-02-09 Sven Neumann <sven@gimp.org> 2005-02-09 Sven Neumann <sven@gimp.org>
* app/display/gimpscalecombobox.[ch] * app/display/gimpscalecombobox.[ch]

16
app/display/gimpscalecombobox.c
View File

@ -51,7 +51,8 @@ static void gimp_scale_combo_box_changed (GimpScaleComboBox *combo_box);
static void gimp_scale_combo_box_scale_iter_set (GtkListStore *store, static void gimp_scale_combo_box_scale_iter_set (GtkListStore *store,
GtkTreeIter *iter, GtkTreeIter *iter,
gdouble scale); gdouble scale,
gboolean persistent);
static gboolean gimp_scale_combo_box_row_separator (GtkTreeModel *model, static gboolean gimp_scale_combo_box_row_separator (GtkTreeModel *model,
GtkTreeIter *iter, GtkTreeIter *iter,
gpointer data); gpointer data);
@ -134,13 +135,13 @@ gimp_scale_combo_box_init (GimpScaleComboBox *combo_box)
for (i = 8; i > 0; i /= 2) for (i = 8; i > 0; i /= 2)
{ {
gtk_list_store_append (store, &iter); gtk_list_store_append (store, &iter);
gimp_scale_combo_box_scale_iter_set (store, &iter, (gdouble) i); gimp_scale_combo_box_scale_iter_set (store, &iter, i, TRUE);
} }
for (i = 2; i <= 8; i *= 2) for (i = 2; i <= 8; i *= 2)
{ {
gtk_list_store_append (store, &iter); gtk_list_store_append (store, &iter);
gimp_scale_combo_box_scale_iter_set (store, &iter, 1.0 / (gdouble) i); gimp_scale_combo_box_scale_iter_set (store, &iter, 1.0 / i, TRUE);
} }
g_signal_connect (combo_box, "changed", g_signal_connect (combo_box, "changed",
@ -225,17 +226,18 @@ gimp_scale_combo_box_row_separator (GtkTreeModel *model,
static void static void
gimp_scale_combo_box_scale_iter_set (GtkListStore *store, gimp_scale_combo_box_scale_iter_set (GtkListStore *store,
GtkTreeIter *iter, GtkTreeIter *iter,
gdouble scale) gdouble scale,
gboolean persistent)
{ {
gchar label[32]; gchar label[32];
g_snprintf (label, sizeof (label), "%d%%", (int) (100.0 * scale)); g_snprintf (label, sizeof (label), "%d%%", (int) ROUND (100.0 * scale));
gtk_list_store_set (store, iter, gtk_list_store_set (store, iter,
SCALE, scale, SCALE, scale,
LABEL, label, LABEL, label,
LABEL_ALIGN, 1.0, LABEL_ALIGN, 1.0,
PERSISTENT, TRUE, PERSISTENT, persistent,
-1); -1);
} }
@ -401,7 +403,7 @@ gimp_scale_combo_box_set_scale (GimpScaleComboBox *combo_box,
} }
gtk_list_store_insert_before (store, &iter, iter_valid ? &sibling : NULL); gtk_list_store_insert_before (store, &iter, iter_valid ? &sibling : NULL);
gimp_scale_combo_box_scale_iter_set (store, &iter, scale); gimp_scale_combo_box_scale_iter_set (store, &iter, scale, FALSE);
} }
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_box), &iter); gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_box), &iter);