Mercurial > pidgin.yaz
changeset 26639:a372ea58c3ae
Change how the progressbar is drawn.
Don't highlight the progress-bar ... because it looks weird when the
window is not in focus.
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sun, 12 Apr 2009 20:55:49 +0000 |
| parents | cd7fa6306f85 |
| children | 85822db8cd84 |
| files | finch/libgnt/gntprogressbar.c |
| diffstat | 1 files changed, 14 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/libgnt/gntprogressbar.c Sun Apr 12 18:58:27 2009 +0000 +++ b/finch/libgnt/gntprogressbar.c Sun Apr 12 20:55:49 2009 +0000 @@ -55,8 +55,10 @@ GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (GNT_PROGRESS_BAR (widget)); gchar progress[8]; gint start, end, i, pos; + int color; g_snprintf (progress, sizeof (progress), "%.1f%%", priv->fraction * 100); + color = gnt_color_pair(GNT_COLOR_NORMAL); switch (priv->orientation) { case GNT_PROGRESS_LEFT_TO_RIGHT: @@ -66,20 +68,20 @@ /* background */ for (i = 0; i < widget->priv.height; i++) - mvwhline (widget->window, i, 0, ' ' | gnt_color_pair (GNT_COLOR_HIGHLIGHT) | A_REVERSE, widget->priv.width); + mvwhline (widget->window, i, 0, ' ' | color, widget->priv.width); /* foreground */ for (i = 0; i < widget->priv.height; i++) - mvwhline (widget->window, i, start, ' ' | gnt_color_pair (GNT_COLOR_HIGHLIGHT), end); + mvwhline (widget->window, i, start, ACS_CKBOARD | color | A_REVERSE, end); /* text */ if (priv->show_value) { - for (i = 0; i < strlen(progress); i++) { - pos = widget->priv.width / 2 - strlen (progress) / 2 + i; - wattrset (widget->window, gnt_color_pair (GNT_COLOR_HIGHLIGHT) | ((pos >= start && pos <= end) ? A_NORMAL : A_REVERSE)); + pos = widget->priv.width / 2 - strlen (progress) / 2; + for (i = 0; i < progress[i]; i++, pos++) { + wattrset (widget->window, color | ((pos < start || pos > end) ? A_NORMAL : A_REVERSE)); mvwprintw (widget->window, widget->priv.height / 2, pos, "%c", progress[i]); } - wattrset (widget->window, gnt_color_pair (GNT_COLOR_HIGHLIGHT)); + wattrset (widget->window, color); } break; @@ -90,20 +92,20 @@ /* background */ for (i = 0; i < widget->priv.width; i++) - mvwvline (widget->window, 0, i, ' ' | gnt_color_pair (GNT_COLOR_HIGHLIGHT) | A_REVERSE, widget->priv.height); + mvwvline (widget->window, 0, i, ' ' | color | A_REVERSE, widget->priv.height); /* foreground */ for (i = 0; i < widget->priv.width; i++) - mvwvline (widget->window, start, i, ' ' | gnt_color_pair (GNT_COLOR_HIGHLIGHT), end); + mvwvline (widget->window, start, i, ' ' | color, end); /* text */ if (priv->show_value) { - for (i = 0; i < strlen(progress); i++) { - pos = widget->priv.height / 2 - strlen (progress) / 2 + i; - wattrset (widget->window, gnt_color_pair (GNT_COLOR_HIGHLIGHT) | ((pos >= start && pos <= end) ? A_NORMAL : A_REVERSE)); + pos = widget->priv.height / 2 - strlen (progress) / 2; + for (i = 0; i < progress[i]; i++, pos++) { + wattrset (widget->window, color | ((pos >= start && pos <= end) ? A_NORMAL : A_REVERSE)); mvwprintw (widget->window, pos, widget->priv.width / 2, "%c\n", progress[i]); } - wattrset (widget->window, gnt_color_pair (GNT_COLOR_HIGHLIGHT)); + wattrset (widget->window, color); } break;