summaryrefslogtreecommitdiff
path: root/src/glibext/widthtracker.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/glibext/widthtracker.c')
-rw-r--r--src/glibext/widthtracker.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/glibext/widthtracker.c b/src/glibext/widthtracker.c
index f0e2068..a3c8cba 100644
--- a/src/glibext/widthtracker.c
+++ b/src/glibext/widthtracker.c
@@ -329,7 +329,7 @@ static void g_width_update_process(GWidthUpdate *update, GtkStatusStack *status)
{
summary = g_width_tracker_get_up_to_date_widths(update->tracker, i);
- for (k = 0; k < BLC_COUNT; k++)
+ for (k = 0; k < update->tracker->col_count; k++)
local->max_widths[k] = MAX(local->max_widths[k], summary->max_widths[k]);
local->merged_width = MAX(local->merged_width, summary->merged_width);
@@ -361,7 +361,7 @@ static void g_width_update_collect(GWidthUpdate *update, line_width_summary *glo
local = &update->summary;
- for (i = 0; i < BLC_COUNT; i++)
+ for (i = 0; i < update->tracker->col_count; i++)
global->max_widths[i] = MAX(global->max_widths[i], local->max_widths[i]);
global->merged_width = MAX(global->merged_width, local->merged_width);
@@ -718,7 +718,7 @@ static void g_width_tracker_reset_widths(GWidthTracker *tracker, size_t index)
if (portion->cached)
{
- for (k = 0; k < BLC_COUNT && tracker->cached; k++)
+ for (k = 0; k < tracker->col_count && tracker->cached; k++)
tracker->cached &= (tracker->summary.max_widths[k] != portion->summary.max_widths[k]);
tracker->cached &= (tracker->summary.merged_width != portion->summary.merged_width);
@@ -1163,7 +1163,7 @@ static void g_width_tracker_ensure_valid_required_widths(GWidthTracker *tracker)
{
summary = g_width_tracker_get_up_to_date_widths(tracker, i);
- for (k = 0; k < BLC_COUNT; k++)
+ for (k = 0; k < tracker->col_count; k++)
global->max_widths[k] = MAX(global->max_widths[k], summary->max_widths[k]);
global->merged_width = MAX(global->merged_width, summary->merged_width);
@@ -1212,7 +1212,7 @@ gint g_width_tracker_get_width(GWidthTracker *tracker, const GDisplayOptions *op
/* Première méthode */
- for (i = 0; i < BLC_COUNT; i++)
+ for (i = 0; i < tracker->col_count; i++)
{
if (i < count)
{
@@ -1222,7 +1222,7 @@ gint g_width_tracker_get_width(GWidthTracker *tracker, const GDisplayOptions *op
col_width += summary->max_widths[i];
- if ((i + 1) < BLC_COUNT)
+ if ((i + 1) < tracker->col_count)
col_width += COL_MARGIN;
}