deal with zero-size selections correctly (ie, select the whole image but

Sat Nov 14 20:02:31 GMT 1998  Austin Donnelly  <austin@greenend.org.uk>

	* app/rect_select.c: deal with zero-size selections correctly (ie,
	select the whole image but don't show marching ants).

	* app/app_procs.c: sort out colourmap before creating splash
	window, so if we need to install a private cmap then everything
	will use it.

	* plug-ins/newsprint/newsprint.c: delete spurious debugging printf.
This commit is contained in:
GMT 1998 Austin Donnelly 1998-11-14 20:06:30 +00:00 committed by Austin Donnelly
parent 5c52dcb85b
commit 3fa6583ed7
7 changed files with 17 additions and 14 deletions

View file

@ -1,3 +1,14 @@
Sat Nov 14 20:02:31 GMT 1998 Austin Donnelly <austin@greenend.org.uk>
* app/rect_select.c: deal with zero-size selections correctly (ie,
select the whole image but don't show marching ants).
* app/app_procs.c: sort out colourmap before creating splash
window, so if we need to install a private cmap then everything
will use it.
* plug-ins/newsprint/newsprint.c: delete spurious debugging printf.
Fri Nov 13 23:07:22 MET 1998 Sven Neumann <sven@gimp.org> Fri Nov 13 23:07:22 MET 1998 Sven Neumann <sven@gimp.org>
* app/gdisplay.[ch] * app/gdisplay.[ch]

View file

@ -344,6 +344,7 @@ make_initialization_status_window(void)
GtkWidget *vbox; GtkWidget *vbox;
win_initstatus = gtk_window_new(GTK_WINDOW_DIALOG); win_initstatus = gtk_window_new(GTK_WINDOW_DIALOG);
gtk_signal_connect (GTK_OBJECT (win_initstatus), "delete_event", gtk_signal_connect (GTK_OBJECT (win_initstatus), "delete_event",
GTK_SIGNAL_FUNC (gtk_true), GTK_SIGNAL_FUNC (gtk_true),
NULL); NULL);
@ -359,14 +360,8 @@ make_initialization_status_window(void)
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
gtk_container_add(GTK_CONTAINER(win_initstatus), vbox); gtk_container_add(GTK_CONTAINER(win_initstatus), vbox);
gtk_widget_push_visual (gtk_preview_get_visual ());
gtk_widget_push_colormap (gtk_preview_get_cmap ());
logo_area = gtk_drawing_area_new (); logo_area = gtk_drawing_area_new ();
gtk_widget_pop_colormap ();
gtk_widget_pop_visual ();
gtk_signal_connect (GTK_OBJECT (logo_area), "expose_event", gtk_signal_connect (GTK_OBJECT (logo_area), "expose_event",
(GtkSignalFunc) splash_logo_expose, NULL); (GtkSignalFunc) splash_logo_expose, NULL);
logo_area_width = ( logo_width > LOGO_WIDTH_MIN ) ? logo_width : LOGO_WIDTH_MIN; logo_area_width = ( logo_width > LOGO_WIDTH_MIN ) ? logo_width : LOGO_WIDTH_MIN;
@ -463,6 +458,8 @@ app_init (void)
gtk_rc_parse (filename); gtk_rc_parse (filename);
} }
if (no_interface == FALSE)
get_standard_colormaps ();
make_initialization_status_window(); make_initialization_status_window();
if (no_interface == FALSE && no_splash == FALSE && win_initstatus) { if (no_interface == FALSE && no_splash == FALSE && win_initstatus) {
splash_text_draw (logo_area); splash_text_draw (logo_area);
@ -530,7 +527,6 @@ app_init (void)
/* Things to do only if there is an interface */ /* Things to do only if there is an interface */
if (no_interface == FALSE) if (no_interface == FALSE)
{ {
get_standard_colormaps ();
devices_init (); devices_init ();
session_init (); session_init ();
create_toolbox (); create_toolbox ();

View file

@ -434,7 +434,7 @@ rect_select_button_release (Tool *tool,
w = (rect_sel->w < 0) ? -rect_sel->w : rect_sel->w; w = (rect_sel->w < 0) ? -rect_sel->w : rect_sel->w;
h = (rect_sel->h < 0) ? -rect_sel->h : rect_sel->h; h = (rect_sel->h < 0) ? -rect_sel->h : rect_sel->h;
if ((!w || !h) && !rect_sel->fixed_width) if ((!w || !h) && !rect_sel->fixed_size)
{ {
/* If there is a floating selection, anchor it */ /* If there is a floating selection, anchor it */
if (gimage_floating_sel (gdisp->gimage)) if (gimage_floating_sel (gdisp->gimage))

View file

@ -434,7 +434,7 @@ rect_select_button_release (Tool *tool,
w = (rect_sel->w < 0) ? -rect_sel->w : rect_sel->w; w = (rect_sel->w < 0) ? -rect_sel->w : rect_sel->w;
h = (rect_sel->h < 0) ? -rect_sel->h : rect_sel->h; h = (rect_sel->h < 0) ? -rect_sel->h : rect_sel->h;
if ((!w || !h) && !rect_sel->fixed_width) if ((!w || !h) && !rect_sel->fixed_size)
{ {
/* If there is a floating selection, anchor it */ /* If there is a floating selection, anchor it */
if (gimage_floating_sel (gdisp->gimage)) if (gimage_floating_sel (gdisp->gimage))

View file

@ -434,7 +434,7 @@ rect_select_button_release (Tool *tool,
w = (rect_sel->w < 0) ? -rect_sel->w : rect_sel->w; w = (rect_sel->w < 0) ? -rect_sel->w : rect_sel->w;
h = (rect_sel->h < 0) ? -rect_sel->h : rect_sel->h; h = (rect_sel->h < 0) ? -rect_sel->h : rect_sel->h;
if ((!w || !h) && !rect_sel->fixed_width) if ((!w || !h) && !rect_sel->fixed_size)
{ {
/* If there is a floating selection, anchor it */ /* If there is a floating selection, anchor it */
if (gimage_floating_sel (gdisp->gimage)) if (gimage_floating_sel (gdisp->gimage))

View file

@ -1417,8 +1417,6 @@ newsprint_dialog (GDrawable *drawable)
{ {
channel_st **chst; channel_st **chst;
printf("making channels\n");
gen_channels(&st, pvals.colourspace); gen_channels(&st, pvals.colourspace);
chst = st.chst[pvals.colourspace]; chst = st.chst[pvals.colourspace];

View file

@ -1417,8 +1417,6 @@ newsprint_dialog (GDrawable *drawable)
{ {
channel_st **chst; channel_st **chst;
printf("making channels\n");
gen_channels(&st, pvals.colourspace); gen_channels(&st, pvals.colourspace);
chst = st.chst[pvals.colourspace]; chst = st.chst[pvals.colourspace];