Commit 3d6478c8 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

put the hex entry above the color history again.

2005-05-20  Sven Neumann  <sven@gimp.org>

	* libgimpwidgets/gimpcolorselection.c: put the hex entry above the
	color history again.

	* libgimpwidgets/gimpcolorscales.c: do not allocate row spacing
	for the alpha row if it isn't visible.
parent 65b2cdba
2005-05-20 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpcolorselection.c: put the hex entry above the
color history again.
* libgimpwidgets/gimpcolorscales.c: do not allocate row spacing
for the alpha row if it isn't visible.
2005-05-19 Manish Singh <yosh@gimp.org> 2005-05-19 Manish Singh <yosh@gimp.org>
* plug-ins/jpeg/jpeg-save.c (save_image): don't do pointer arithmetic * plug-ins/jpeg/jpeg-save.c (save_image): don't do pointer arithmetic
......
...@@ -173,7 +173,6 @@ gimp_color_scales_init (GimpColorScales *scales) ...@@ -173,7 +173,6 @@ gimp_color_scales_init (GimpColorScales *scales)
table = gtk_table_new (7, 4, FALSE); table = gtk_table_new (7, 4, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 1); gtk_table_set_row_spacings (GTK_TABLE (table), 1);
gtk_table_set_row_spacing (GTK_TABLE (table), 2, 3); /* hsv <-> rgb */ gtk_table_set_row_spacing (GTK_TABLE (table), 2, 3); /* hsv <-> rgb */
gtk_table_set_row_spacing (GTK_TABLE (table), 5, 3); /* rgb <-> alpha */
gtk_table_set_col_spacings (GTK_TABLE (table), 2); gtk_table_set_col_spacings (GTK_TABLE (table), 2);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 0); gtk_table_set_col_spacing (GTK_TABLE (table), 0, 0);
gtk_box_pack_start (GTK_BOX (scales), table, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (scales), table, FALSE, FALSE, 0);
...@@ -262,11 +261,17 @@ gimp_color_scales_set_show_alpha (GimpColorSelector *selector, ...@@ -262,11 +261,17 @@ gimp_color_scales_set_show_alpha (GimpColorSelector *selector,
GtkWidget *label; GtkWidget *label;
GtkWidget *scale; GtkWidget *scale;
GtkWidget *spin; GtkWidget *spin;
GtkWidget *table;
label = GIMP_SCALE_ENTRY_LABEL (scales->slider_data[6]); label = GIMP_SCALE_ENTRY_LABEL (scales->slider_data[6]);
scale = GIMP_SCALE_ENTRY_SCALE (scales->slider_data[6]); scale = GIMP_SCALE_ENTRY_SCALE (scales->slider_data[6]);
spin = GIMP_SCALE_ENTRY_SPINBUTTON (scales->slider_data[6]); spin = GIMP_SCALE_ENTRY_SPINBUTTON (scales->slider_data[6]);
table = gtk_widget_get_parent (scale);
if (GTK_IS_TABLE (table))
gtk_table_set_row_spacing (GTK_TABLE (table), 5, /* rgb <-> alpha */
show_alpha ? 3 : 0);
if (show_alpha) if (show_alpha)
{ {
gtk_widget_show (label); gtk_widget_show (label);
......
...@@ -273,7 +273,7 @@ gimp_color_selection_init (GimpColorSelection *selection) ...@@ -273,7 +273,7 @@ gimp_color_selection_init (GimpColorSelection *selection)
/* The hex triplet entry */ /* The hex triplet entry */
hbox = gtk_hbox_new (FALSE, 6); hbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_end (GTK_BOX (selection->right_vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (selection->right_vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox); gtk_widget_show (hbox);
entry = gimp_color_hex_entry_new (); entry = gimp_color_hex_entry_new ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment