comparison pidgin/gtkconv.c @ 29282:5c2bbeef2eb8

Patch from Gabriel Schulhof to correctly size the GtkIMHtml entry in the conversation and status box when the 'interior-focus' style is FALSE. Fixes #10675. committer: Elliott Sales de Andrade <[e-mail]>

29281:9dc0f311d383

	int pad_top, pad_inside, pad_bottom;
	int total_height = (gtkconv->imhtml->allocation.height + gtkconv->entry->allocation.height);
	int max_height = total_height / 2;
	int min_lines = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines");
	int min_height;

	pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry));
	pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry));
	pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(gtkconv->entry));

	/* Make sure there's enough room for at least min_lines. Allocate enough space to
	 * prevent scrolling when the second line is a continuation of the first line, or
	 * is the beginning of a new paragraph. */
	min_height = min_lines * (oneline.height + MAX(pad_inside, pad_top + pad_bottom));
	height = CLAMP(height, MIN(min_height, max_height), max_height);

	diff = height - gtkconv->entry->allocation.height;
	if (ABS(diff) < oneline.height / 2)
		return FALSE;

29282:5c2bbeef2eb8

	int pad_top, pad_inside, pad_bottom;
	int total_height = (gtkconv->imhtml->allocation.height + gtkconv->entry->allocation.height);
	int max_height = total_height / 2;
	int min_lines = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines");
	int min_height;
	gboolean interior_focus;
	int focus_width;

	pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry));
	pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry));
	pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(gtkconv->entry));

	/* Make sure there's enough room for at least min_lines. Allocate enough space to
	 * prevent scrolling when the second line is a continuation of the first line, or
	 * is the beginning of a new paragraph. */
	min_height = min_lines * (oneline.height + MAX(pad_inside, pad_top + pad_bottom));
	height = CLAMP(height, MIN(min_height, max_height), max_height);

	gtk_widget_style_get(gtkconv->entry,
	                     "interior-focus", &interior_focus,
	                     "focus-line-width", &focus_width,
	                     NULL);
	if (!interior_focus)
		height += 2 * focus_width;

	diff = height - gtkconv->entry->allocation.height;
	if (ABS(diff) < oneline.height / 2)
		return FALSE;