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

Fix #316087.

Browse Source 
2008-07-11  Kristian Rietveld  <kris@gtk.org>

	Bug 316087 - Resizing columns is chaotic

	* gtk/gtktreeprivate.h: add new member fields.

	* gtk/gtktreeview.c (gtk_tree_view_init), (validate_row): set post
	validation flag,
	(gtk_tree_view_size_allocate_columns): rework the size allocation
	mechanism to only recalculate the expand values if the width of the
	widget, content or the column configuration has changed,
	(gtk_tree_view_size_allocate): move call to size_allocate_columns()
	to before the adjustment updates so the proper width is used after
	we updated it,
	(gtk_tree_view_button_press), (gtk_tree_view_motion_resize_column):
	use the column width minus the expand value for the resized width,
	(gtk_tree_view_move_column_after): update call to
	gtk_tree_view_size_allocate_columns().

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_expand): set use
	resized width to FALSE.

	* tests/Makefile.am:
	* tests/testtreecolumnsizing.c: new interactive test program
	for testing column resizing with different column configurations.


svn path=/trunk/; revision=20818
This commit is contained in:
Kristian Rietveld
2008-07-11 14:17:49 +00:00
committed by Kristian Rietveld
parent 1d510a9e84
commit 2cc1247433
6 changed files with 359 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/Makefile.am
View File

@ -72,6 +72,7 @@ noinst_PROGRAMS = $(TEST_PROGS) \
testtreefocus \
testtreeflow \
testtreecolumns \
testtreecolumnsizing \
testtreesort \
treestoretest \
testxinerama \
@ -145,6 +146,7 @@ testtreeview_DEPENDENCIES = $(DEPS)
testtreefocus_DEPENDENCIES = $(DEPS)
testtreeflow_DEPENDENCIES = $(DEPS)
testtreecolumns_DEPENDENCIES = $(DEPS)
testtreecolumnsizing_DEPENDENCIES = $(DEPS)
testtreesort_DEPENDENCIES = $(DEPS)
treestoretest_DEPENDENCIES = $(TEST_DEPS)
testxinerama_DEPENDENCIES = $(TEST_DEPS)
@ -200,6 +202,7 @@ testtreeview_LDADD = $(LDADDS)
testtreefocus_LDADD = $(LDADDS)
testtreeflow_LDADD = $(LDADDS)
testtreecolumns_LDADD = $(LDADDS)
testtreecolumnsizing_LDADD = $(LDADDS)
testtreesort_LDADD = $(LDADDS)
testtext_LDADD = $(LDADDS)
treestoretest_LDADD = $(LDADDS)

237
tests/testtreecolumnsizing.c Normal file
View File

@ -0,0 +1,237 @@
/* testtreecolumnsizing.c: Test case for tree view column resizing.
*
* Copyright (C) 2008 Kristian Rietveld <kris@gtk.org>
*
* This work is provided "as is"; redistribution and modification
* in whole or in part, in any medium, physical or electronic is
* permitted without restriction.
*
* This work is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* In no event shall the authors or contributors be liable for any
* direct, indirect, incidental, special, exemplary, or consequential
* damages (including, but not limited to, procurement of substitute
* goods or services; loss of use, data, or profits; or business
* interruption) however caused and on any theory of liability, whether
* in contract, strict liability, or tort (including negligence or
* otherwise) arising in any way out of the use of this software, even
* if advised of the possibility of such damage.
*/
#include <gtk/gtk.h>
#include <string.h>
#define NO_EXPAND "No expandable columns"
#define SINGLE_EXPAND "One expandable column"
#define MULTI_EXPAND "Multiple expandable columns"
#define LAST_EXPAND "Last column is expandable"
#define BORDER_EXPAND "First and last columns are expandable"
#define ALL_EXPAND "All columns are expandable"
#define N_ROWS 10
static GtkTreeModel *
create_model (void)
{
int i;
GtkListStore *store;
store = gtk_list_store_new (5,
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_STRING);
for (i = 0; i < N_ROWS; i++)
{
gchar *str;
str = g_strdup_printf ("Row %d", i);
gtk_list_store_insert_with_values (store, NULL, i,
0, str,
1, "Blah blah blah blah blah",
2, "Less blah",
3, "Medium length",
4, "Eek",
-1);
g_free (str);
}
return GTK_TREE_MODEL (store);
}
static void
toggle_long_content_row (GtkToggleButton *button,
gpointer user_data)
{
GtkTreeModel *model;
model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data));
if (gtk_tree_model_iter_n_children (model, NULL) == N_ROWS)
{
gtk_list_store_insert_with_values (GTK_LIST_STORE (model), NULL, N_ROWS,
0, "Very very very very longggggg",
1, "Blah blah blah blah blah",
2, "Less blah",
3, "Medium length",
4, "Eek we make the scrollbar appear",
-1);
}
else
{
GtkTreeIter iter;
gtk_tree_model_iter_nth_child (model, &iter, NULL, N_ROWS);
gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
}
}
static void
combo_box_changed (GtkComboBox *combo_box,
gpointer user_data)
{
gchar *str;
GList *list;
GList *columns;
str = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_box));
if (!str)
return;
columns = gtk_tree_view_get_columns (GTK_TREE_VIEW (user_data));
if (!strcmp (str, NO_EXPAND))
{
for (list = columns; list; list = list->next)
gtk_tree_view_column_set_expand (list->data, FALSE);
}
else if (!strcmp (str, SINGLE_EXPAND))
{
for (list = columns; list; list = list->next)
{
if (list->prev && !list->prev->prev)
/* This is the second column */
gtk_tree_view_column_set_expand (list->data, TRUE);
else
gtk_tree_view_column_set_expand (list->data, FALSE);
}
}
else if (!strcmp (str, MULTI_EXPAND))
{
for (list = columns; list; list = list->next)
{
if (list->prev && !list->prev->prev)
/* This is the second column */
gtk_tree_view_column_set_expand (list->data, TRUE);
else if (list->prev && !list->prev->prev->prev)
/* This is the third column */
gtk_tree_view_column_set_expand (list->data, TRUE);
else
gtk_tree_view_column_set_expand (list->data, FALSE);
}
}
else if (!strcmp (str, LAST_EXPAND))
{
for (list = columns; list->next; list = list->next)
gtk_tree_view_column_set_expand (list->data, FALSE);
/* This is the last column */
gtk_tree_view_column_set_expand (list->data, TRUE);
}
else if (!strcmp (str, BORDER_EXPAND))
{
gtk_tree_view_column_set_expand (columns->data, TRUE);
for (list = columns->next; list->next; list = list->next)
gtk_tree_view_column_set_expand (list->data, FALSE);
/* This is the last column */
gtk_tree_view_column_set_expand (list->data, TRUE);
}
else if (!strcmp (str, ALL_EXPAND))
{
for (list = columns; list; list = list->next)
gtk_tree_view_column_set_expand (list->data, TRUE);
}
g_free (str);
g_list_free (columns);
}
int
main (int argc, char **argv)
{
int i;
GtkWidget *window;
GtkWidget *vbox;
GtkWidget *combo_box;
GtkWidget *sw;
GtkWidget *tree_view;
GtkWidget *button;
gtk_init (&argc, &argv);
/* Window and box */
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL);
gtk_container_set_border_width (GTK_CONTAINER (window), 5);
vbox = gtk_vbox_new (FALSE, 5);
gtk_container_add (GTK_CONTAINER (window), vbox);
/* Option menu contents */
combo_box = gtk_combo_box_new_text ();
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), NO_EXPAND);
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), SINGLE_EXPAND);
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), MULTI_EXPAND);
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), LAST_EXPAND);
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), BORDER_EXPAND);
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), ALL_EXPAND);
gtk_box_pack_start (GTK_BOX (vbox), combo_box, FALSE, FALSE, 0);
/* Scrolled window and tree view */
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
tree_view = gtk_tree_view_new_with_model (create_model ());
gtk_container_add (GTK_CONTAINER (sw), tree_view);
for (i = 0; i < 5; i++)
{
GtkTreeViewColumn *column;
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
i, "Header",
gtk_cell_renderer_text_new (),
"text", i,
NULL);
column = gtk_tree_view_get_column (GTK_TREE_VIEW (tree_view), i);
gtk_tree_view_column_set_resizable (column, TRUE);
}
/* Toggle button for long content row */
button = gtk_toggle_button_new_with_label ("Toggle long content row");
g_signal_connect (button, "toggled",
G_CALLBACK (toggle_long_content_row), tree_view);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
/* Set up option menu callback and default item */
g_signal_connect (combo_box, "changed",
G_CALLBACK (combo_box_changed), tree_view);
gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
/* Done */
gtk_widget_show_all (window);
gtk_main ();
return 0;
}