Skip to content

Commit 4a52a73

Browse files
provisional for #1032 -- ease harsh contrast for white-on-black, now white-on-grey.
1 parent b235771 commit 4a52a73

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

src/main/parallel_view.cc

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ extern GtkWidget *entryIntLookup;
7878

7979
SWBuf unknown_parallel = _("Unknown parallel module: ");
8080

81+
// for alternation color ease.
82+
gchar *white = "#FFFFFF", *grey = "#606060", *bg_choice;
83+
8184
/******************************************************************************
8285
* static
8386
*/
@@ -631,6 +634,12 @@ void main_update_parallel_page(void)
631634
data = g_string_new(tmpBuf);
632635
g_free(tmpBuf);
633636

637+
// if alternating && bg color is white, substitute a milder grey for harsh black bg.
638+
if (settings.alternation && !strcmp(settings.bible_bg_color, white))
639+
bg_choice = grey; // avoid blaring visual contrast
640+
else
641+
bg_choice = settings.bible_text_color;
642+
634643
if (settings.parallel_list) {
635644
gchar *mod_name;
636645
for (modidx = 0;
@@ -654,7 +663,7 @@ void main_update_parallel_page(void)
654663

655664
/* alternating background color */
656665
if (settings.alternation && (modidx % 2 == 1)) {
657-
rowcolor = settings.bible_text_color;
666+
rowcolor = bg_choice;
658667
textcolor = settings.bible_bg_color;
659668
} else {
660669
rowcolor = settings.bible_bg_color;
@@ -825,6 +834,12 @@ static void interpolate_parallel_display(SWModule *control,
825834
cur_verse = backend_p->key_get_verse(control_name, tmpkey);
826835
settings.intCurVerse = cur_verse;
827836

837+
// if alternating && bg color is white, substitute a milder grey for harsh black bg.
838+
if (settings.alternation && !strcmp(settings.bible_bg_color, white))
839+
bg_choice = grey; // avoid blaring visual contrast
840+
else
841+
bg_choice = settings.bible_text_color;
842+
828843
for (verse = 1; verse <= xverses; ++verse) {
829844
snprintf(tmpbuf, 255, "%s %d:%d", cur_book, cur_chapter, verse);
830845
free(tmpkey);
@@ -834,7 +849,7 @@ static void interpolate_parallel_display(SWModule *control,
834849

835850
// alternate background colors.
836851
bgColor = (settings.alternation && (verse % 2 == 0))
837-
? settings.bible_text_color
852+
? bg_choice
838853
: settings.bible_bg_color;
839854

840855
for (modidx = 0; modidx < parallel_count; modidx++) {

0 commit comments

Comments
 (0)