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

app/palette.c

Browse Source 
Sat Sep 11 17:46:37 BST 1999 Andy Thomas <alt@gimp.org>

	* app/palette.c

	When resizing the dialog it now fills with colours (as expected).
This commit is contained in:
BST 1999 Andy Thomas
1999-09-11 16:55:40 +00:00
committed by Andy Thomas
parent 267633fa89
commit d866698eb3
4 changed files with 69 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Sep 11 17:46:37 BST 1999 Andy Thomas <alt@gimp.org>
* app/palette.c
When resizing the dialog it now fills with colours (as expected).
Sat Sep 11 17:02:06 CEST 1999 Olof S Kylander <olof@frozenriver.com> Sat Sep 11 17:02:06 CEST 1999 Olof S Kylander <olof@frozenriver.com>
* plug-ins/pygimp/gimpenums.py: Fix of enum error * plug-ins/pygimp/gimpenums.py: Fix of enum error

24
app/gui/palette-editor.c
View File

@ -120,6 +120,7 @@ struct _PaletteDialog
gfloat zoom_factor; /* range from 0.1 to 4.0 */ gfloat zoom_factor; /* range from 0.1 to 4.0 */
gint columns; gint columns;
gint freeze_update; gint freeze_update;
gint columns_valid;
}; };
/* This one is called from palette_select.c */ /* This one is called from palette_select.c */
@ -1487,7 +1488,6 @@ palette_color_area_events (GtkWidget *widget,
GdkEventButton *bevent; GdkEventButton *bevent;
GSList *tmp_link; GSList *tmp_link;
int r, g, b; int r, g, b;
int width, height;
int entry_width; int entry_width;
int entry_height; int entry_height;
int row, col; int row, col;
@ -1495,10 +1495,11 @@ palette_color_area_events (GtkWidget *widget,
switch (event->type) switch (event->type)
{ {
case GDK_EXPOSE:
redraw_palette(palette);
break;
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
bevent = (GdkEventButton *) event; bevent = (GdkEventButton *) event;
width = palette->color_area->requisition.width;
height = palette->color_area->requisition.height;
entry_width = (ENTRY_WIDTH*palette->zoom_factor)+SPACING; entry_width = (ENTRY_WIDTH*palette->zoom_factor)+SPACING;
entry_height = (ENTRY_HEIGHT*palette->zoom_factor)+SPACING; entry_height = (ENTRY_HEIGHT*palette->zoom_factor)+SPACING;
col = (bevent->x - 1) / entry_width; col = (bevent->x - 1) / entry_width;
@ -1886,6 +1887,20 @@ redraw_palette (PaletteDialog *palette)
gint nrows; gint nrows;
gint n_entries; gint n_entries;
gint new_pre_width; gint new_pre_width;
gint entry_width;
guint width;
gint ncols;
width = palette->color_area->parent->parent->allocation.width;
entry_width = (ENTRY_WIDTH*palette->zoom_factor)+SPACING;
ncols = width/entry_width;
if(ncols <= 0 ||
(palette->columns_valid && palette->columns == ncols))
return;
palette->columns_valid = TRUE;
palette->columns = ncols;
n_entries = palette->entries->n_colors; n_entries = palette->entries->n_colors;
nrows = n_entries / palette->columns; nrows = n_entries / palette->columns;
@ -1937,6 +1952,7 @@ palette_list_item_update (GtkWidget *widget,
(PaletteEntriesP) gtk_clist_get_row_data (GTK_CLIST (palette->clist), row); (PaletteEntriesP) gtk_clist_get_row_data (GTK_CLIST (palette->clist), row);
palette->entries = p_entries; palette->entries = p_entries;
palette->columns_valid = FALSE;
redraw_palette (palette); redraw_palette (palette);
@ -2020,6 +2036,7 @@ create_palette_dialog (gint vert)
palette->color_select_active = 0; palette->color_select_active = 0;
palette->zoom_factor = 1.0; palette->zoom_factor = 1.0;
palette->columns = COLUMNS; palette->columns = COLUMNS;
palette->columns_valid = TRUE;
palette->freeze_update = FALSE; palette->freeze_update = FALSE;
palette->shell = gtk_dialog_new (); palette->shell = gtk_dialog_new ();
@ -2308,6 +2325,7 @@ palette_drop_color (GtkWidget *widget,
g_free (name); g_free (name);
palette->columns_valid = FALSE;
redraw_palette (palette); redraw_palette (palette);
list = palette_entries_list; list = palette_entries_list;

24
app/palette.c
View File

@ -120,6 +120,7 @@ struct _PaletteDialog
gfloat zoom_factor; /* range from 0.1 to 4.0 */ gfloat zoom_factor; /* range from 0.1 to 4.0 */
gint columns; gint columns;
gint freeze_update; gint freeze_update;
gint columns_valid;
}; };
/* This one is called from palette_select.c */ /* This one is called from palette_select.c */
@ -1487,7 +1488,6 @@ palette_color_area_events (GtkWidget *widget,
GdkEventButton *bevent; GdkEventButton *bevent;
GSList *tmp_link; GSList *tmp_link;
int r, g, b; int r, g, b;
int width, height;
int entry_width; int entry_width;
int entry_height; int entry_height;
int row, col; int row, col;
@ -1495,10 +1495,11 @@ palette_color_area_events (GtkWidget *widget,
switch (event->type) switch (event->type)
{ {
case GDK_EXPOSE:
redraw_palette(palette);
break;
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
bevent = (GdkEventButton *) event; bevent = (GdkEventButton *) event;
width = palette->color_area->requisition.width;
height = palette->color_area->requisition.height;
entry_width = (ENTRY_WIDTH*palette->zoom_factor)+SPACING; entry_width = (ENTRY_WIDTH*palette->zoom_factor)+SPACING;
entry_height = (ENTRY_HEIGHT*palette->zoom_factor)+SPACING; entry_height = (ENTRY_HEIGHT*palette->zoom_factor)+SPACING;
col = (bevent->x - 1) / entry_width; col = (bevent->x - 1) / entry_width;
@ -1886,6 +1887,20 @@ redraw_palette (PaletteDialog *palette)
gint nrows; gint nrows;
gint n_entries; gint n_entries;
gint new_pre_width; gint new_pre_width;
gint entry_width;
guint width;
gint ncols;
width = palette->color_area->parent->parent->allocation.width;
entry_width = (ENTRY_WIDTH*palette->zoom_factor)+SPACING;
ncols = width/entry_width;
if(ncols <= 0 ||
(palette->columns_valid && palette->columns == ncols))
return;
palette->columns_valid = TRUE;
palette->columns = ncols;
n_entries = palette->entries->n_colors; n_entries = palette->entries->n_colors;
nrows = n_entries / palette->columns; nrows = n_entries / palette->columns;
@ -1937,6 +1952,7 @@ palette_list_item_update (GtkWidget *widget,
(PaletteEntriesP) gtk_clist_get_row_data (GTK_CLIST (palette->clist), row); (PaletteEntriesP) gtk_clist_get_row_data (GTK_CLIST (palette->clist), row);
palette->entries = p_entries; palette->entries = p_entries;
palette->columns_valid = FALSE;
redraw_palette (palette); redraw_palette (palette);
@ -2020,6 +2036,7 @@ create_palette_dialog (gint vert)
palette->color_select_active = 0; palette->color_select_active = 0;
palette->zoom_factor = 1.0; palette->zoom_factor = 1.0;
palette->columns = COLUMNS; palette->columns = COLUMNS;
palette->columns_valid = TRUE;
palette->freeze_update = FALSE; palette->freeze_update = FALSE;
palette->shell = gtk_dialog_new (); palette->shell = gtk_dialog_new ();
@ -2308,6 +2325,7 @@ palette_drop_color (GtkWidget *widget,
g_free (name); g_free (name);
palette->columns_valid = FALSE;
redraw_palette (palette); redraw_palette (palette);
list = palette_entries_list; list = palette_entries_list;

24
app/widgets/gimppaletteeditor.c
View File

@ -120,6 +120,7 @@ struct _PaletteDialog
gfloat zoom_factor; /* range from 0.1 to 4.0 */ gfloat zoom_factor; /* range from 0.1 to 4.0 */
gint columns; gint columns;
gint freeze_update; gint freeze_update;
gint columns_valid;
}; };
/* This one is called from palette_select.c */ /* This one is called from palette_select.c */
@ -1487,7 +1488,6 @@ palette_color_area_events (GtkWidget *widget,
GdkEventButton *bevent; GdkEventButton *bevent;
GSList *tmp_link; GSList *tmp_link;
int r, g, b; int r, g, b;
int width, height;
int entry_width; int entry_width;
int entry_height; int entry_height;
int row, col; int row, col;
@ -1495,10 +1495,11 @@ palette_color_area_events (GtkWidget *widget,
switch (event->type) switch (event->type)
{ {
case GDK_EXPOSE:
redraw_palette(palette);
break;
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
bevent = (GdkEventButton *) event; bevent = (GdkEventButton *) event;
width = palette->color_area->requisition.width;
height = palette->color_area->requisition.height;
entry_width = (ENTRY_WIDTH*palette->zoom_factor)+SPACING; entry_width = (ENTRY_WIDTH*palette->zoom_factor)+SPACING;
entry_height = (ENTRY_HEIGHT*palette->zoom_factor)+SPACING; entry_height = (ENTRY_HEIGHT*palette->zoom_factor)+SPACING;
col = (bevent->x - 1) / entry_width; col = (bevent->x - 1) / entry_width;
@ -1886,6 +1887,20 @@ redraw_palette (PaletteDialog *palette)
gint nrows; gint nrows;
gint n_entries; gint n_entries;
gint new_pre_width; gint new_pre_width;
gint entry_width;
guint width;
gint ncols;
width = palette->color_area->parent->parent->allocation.width;
entry_width = (ENTRY_WIDTH*palette->zoom_factor)+SPACING;
ncols = width/entry_width;
if(ncols <= 0 ||
(palette->columns_valid && palette->columns == ncols))
return;
palette->columns_valid = TRUE;
palette->columns = ncols;
n_entries = palette->entries->n_colors; n_entries = palette->entries->n_colors;
nrows = n_entries / palette->columns; nrows = n_entries / palette->columns;
@ -1937,6 +1952,7 @@ palette_list_item_update (GtkWidget *widget,
(PaletteEntriesP) gtk_clist_get_row_data (GTK_CLIST (palette->clist), row); (PaletteEntriesP) gtk_clist_get_row_data (GTK_CLIST (palette->clist), row);
palette->entries = p_entries; palette->entries = p_entries;
palette->columns_valid = FALSE;
redraw_palette (palette); redraw_palette (palette);
@ -2020,6 +2036,7 @@ create_palette_dialog (gint vert)
palette->color_select_active = 0; palette->color_select_active = 0;
palette->zoom_factor = 1.0; palette->zoom_factor = 1.0;
palette->columns = COLUMNS; palette->columns = COLUMNS;
palette->columns_valid = TRUE;
palette->freeze_update = FALSE; palette->freeze_update = FALSE;
palette->shell = gtk_dialog_new (); palette->shell = gtk_dialog_new ();
@ -2308,6 +2325,7 @@ palette_drop_color (GtkWidget *widget,
g_free (name); g_free (name);
palette->columns_valid = FALSE;
redraw_palette (palette); redraw_palette (palette);
list = palette_entries_list; list = palette_entries_list;