comparison pidgin/gtkconv.c @ 20838:effa512ad24a

fix the auto resize code for the showing formatting toolbar case, which is the default. Previously it wasn't taking the height of the formatting toolbar into account Surprisingly I don't see a ticket for this.

20837:ccb728fa5af8

	GtkTextBuffer *buffer;
	GtkTextIter iter;
	int wrapped_lines;
	int lines;
	GdkRectangle oneline;
	GtkRequisition sr;
	int height;
	int pad_top, pad_inside, pad_bottom;

	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry));

	wrapped_lines = 1;

	height = (oneline.height + pad_top + pad_bottom) * lines;
	height += (oneline.height + pad_inside) * (wrapped_lines - lines);

	gtkconv->auto_resize = TRUE;
	g_idle_add(reset_auto_resize_cb, gtkconv);
	gtk_widget_size_request(gtkconv->lower_hbox, &sr);
	if (sr.height < height + PIDGIN_HIG_BOX_SPACE) {
		gtkconv->entry_growing = TRUE;
		gtk_widget_set_size_request(gtkconv->lower_hbox, -1, height + PIDGIN_HIG_BOX_SPACE);
	}
}

static void
setup_chat_topic(PidginConversation *gtkconv, GtkWidget *vbox)

20838:effa512ad24a

	GtkTextBuffer *buffer;
	GtkTextIter iter;
	int wrapped_lines;
	int lines;
	GdkRectangle oneline;
	GtkRequisition sr, entry_sr;
	int height, diff;
	int pad_top, pad_inside, pad_bottom;

	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry));

	wrapped_lines = 1;

	height = (oneline.height + pad_top + pad_bottom) * lines;
	height += (oneline.height + pad_inside) * (wrapped_lines - lines);

	gtkconv->auto_resize = TRUE;
	g_idle_add(reset_auto_resize_cb, gtkconv);

	gtk_widget_size_request(gtkconv->entry, &entry_sr);
	diff = height - entry_sr.height;

	if (diff > 0) {
		gtk_widget_size_request(gtkconv->lower_hbox, &sr);
		gtkconv->entry_growing = TRUE;
		gtk_widget_set_size_request(gtkconv->lower_hbox, -1, diff + sr.height);
	}
}

static void
setup_chat_topic(PidginConversation *gtkconv, GtkWidget *vbox)