comparison finch/libgnt/gnttree.c @ 15971:05d347516fcd

Fine tune column hiding.

15970:790d1d003825

{
	GString *string = g_string_new(NULL);
	GList *iter;
	int i;
	gboolean notfirst = FALSE;

	for (i = 0, iter = row->columns; i < tree->ncol && iter; i++, iter = iter->next)
	{
		GntTreeCol *col = iter->data;
		const char *text;
		int len = gnt_util_onscreen_width(col->text, NULL);
		int fl = 0;
		gboolean cut = FALSE;

		if (tree->columns[i].invisible)
			continue;

		if (i == 0)
		{
			if (row->choice)
			{

		else
			g_string_append_c(string, ' ');

		notfirst = TRUE;

		if (len > tree->columns[i].width) {
			len = tree->columns[i].width - 1;
			cut = TRUE;
		}
		text = gnt_util_onscreen_width_to_pointer(col->text, len - fl, NULL);
		string = g_string_append_len(string, col->text, text - col->text);
		if (cut) { /* ellipsis */

				string = g_string_append(string, "\342\200\246");
			len++;
		}

		if (len < tree->columns[i].width && iter->next)
			g_string_append_printf(string, "%*s", tree->columns[i].width - len, "");
	}
	return g_string_free(string, FALSE);
}

#define NEXT_X x += tree->columns[i].width + (i > 0 ? 1 : 0)

15971:05d347516fcd

{
	GString *string = g_string_new(NULL);
	GList *iter;
	int i;
	gboolean notfirst = FALSE;
	int lastvisible = tree->ncol;

	while (lastvisible && tree->columns[lastvisible].invisible)
		lastvisible--;

	for (i = 0, iter = row->columns; i < tree->ncol && iter; i++, iter = iter->next)
	{
		GntTreeCol *col = iter->data;
		const char *text;
		int len = gnt_util_onscreen_width(col->text, NULL);
		int fl = 0;
		gboolean cut = FALSE;
		int width;

		if (tree->columns[i].invisible)
			continue;

		if (i == lastvisible)
			width = GNT_WIDGET(tree)->priv.width - gnt_util_onscreen_width(string->str, NULL);
		else
			width = tree->columns[i].width;

		if (i == 0)
		{
			if (row->choice)
			{

		else
			g_string_append_c(string, ' ');

		notfirst = TRUE;

		if (len > width) {
			len = width - 1;
			cut = TRUE;
		}
		text = gnt_util_onscreen_width_to_pointer(col->text, len - fl, NULL);
		string = g_string_append_len(string, col->text, text - col->text);
		if (cut) { /* ellipsis */

				string = g_string_append(string, "\342\200\246");
			len++;
		}

		if (len < tree->columns[i].width && iter->next)
			g_string_append_printf(string, "%*s", width - len, "");
	}
	return g_string_free(string, FALSE);
}

#define NEXT_X x += tree->columns[i].width + (i > 0 ? 1 : 0)