From 7df026ac0eaa8ddb5d395bdc8d00bedf35496147 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Mon, 6 Mar 2000 07:41:11 +0000 Subject: Have identical values get sorted by their actual row. 2000-03-06 Christopher James Lahey * e-table-sorted-variable.c: Have identical values get sorted by their actual row. svn path=/trunk/; revision=2071 --- widgets/e-table/ChangeLog | 5 +++++ widgets/e-table/e-table-sorted-variable.c | 3 +++ widgets/table/e-table-sorted-variable.c | 3 +++ 3 files changed, 11 insertions(+) (limited to 'widgets') diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index 2239817da5..42f01d3863 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,3 +1,8 @@ +2000-03-06 Christopher James Lahey + + * e-table-sorted-variable.c: Have identical values get sorted by + their actual row. + 2000-03-06 Christopher James Lahey * e-cell-text.c: Draw selected row. diff --git a/widgets/e-table/e-table-sorted-variable.c b/widgets/e-table/e-table-sorted-variable.c index 478038fdb7..907ec1cc4d 100644 --- a/widgets/e-table/e-table-sorted-variable.c +++ b/widgets/e-table/e-table-sorted-variable.c @@ -78,6 +78,9 @@ etsv_add (ETableSubsetVariable *etssv, int comp_val = (*comp)(val, e_table_model_value_at(etss->source, col, etss->map_table[i])); if ( (ascending && comp_val < 0) || ((!ascending) && comp_val > 0) ) break; + if ( comp_val == 0 ) + if ( (ascending && row < etss->map_table[i]) || ((!ascending) && row > etss->map_table[i]) ) + break; } if ( etss->n_map + 1 > etssv->n_vals_allocated ) { etss->map_table = g_realloc(etss->map_table, (etssv->n_vals_allocated + INCREMENT_AMOUNT) * sizeof(int)); diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c index 478038fdb7..907ec1cc4d 100644 --- a/widgets/table/e-table-sorted-variable.c +++ b/widgets/table/e-table-sorted-variable.c @@ -78,6 +78,9 @@ etsv_add (ETableSubsetVariable *etssv, int comp_val = (*comp)(val, e_table_model_value_at(etss->source, col, etss->map_table[i])); if ( (ascending && comp_val < 0) || ((!ascending) && comp_val > 0) ) break; + if ( comp_val == 0 ) + if ( (ascending && row < etss->map_table[i]) || ((!ascending) && row > etss->map_table[i]) ) + break; } if ( etss->n_map + 1 > etssv->n_vals_allocated ) { etss->map_table = g_realloc(etss->map_table, (etssv->n_vals_allocated + INCREMENT_AMOUNT) * sizeof(int)); -- cgit v1.2.3