1 files changed, 5 insertions, 8 deletions

diff --git a/modules/images.py b/modules/images.py
index 1906e2ab..320008be 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -10,7 +10,7 @@ import re
 import numpy as np

 import piexif

 import piexif.helper

-from PIL import Image, ImageFont, ImageDraw, PngImagePlugin

+from PIL import Image, ImageFont, ImageDraw, ImageColor, PngImagePlugin

 import string

 import json

 import hashlib

@@ -156,10 +156,10 @@ def draw_grid_annotations(im, width, height, hor_texts, ver_texts, margin=0):
             while drawing.multiline_textsize(line.text, font=fnt)[0] > line.allowed_width and fontsize > 0:

                 fontsize -= 1

                 fnt = get_font(fontsize)

-            drawing.multiline_text((draw_x, draw_y + line.size[1] / 2), line.text, font=fnt, fill=color_active if line.is_active else color_inactive, anchor="mm", align="center")

+            drawing.multiline_text((draw_x, draw_y + line.size[1] / 2), line.text, font=fnt, fill=ImageColor.getcolor(opts.grid_text_color_active, 'RGB') if line.is_active else ImageColor.getcolor(opts.grid_text_color_inactive, 'RGB'), anchor="mm", align="center")

 

             if not line.is_active:

-                drawing.line((draw_x - line.size[0] // 2, draw_y + line.size[1] // 2, draw_x + line.size[0] // 2, draw_y + line.size[1] // 2), fill=color_inactive, width=4)

+                drawing.line((draw_x - line.size[0] // 2, draw_y + line.size[1] // 2, draw_x + line.size[0] // 2, draw_y + line.size[1] // 2), fill=ImageColor.getcolor(opts.grid_text_color_inactive, 'RGB'), width=4)

 

             draw_y += line.size[1] + line_spacing

 

@@ -168,9 +168,6 @@ def draw_grid_annotations(im, width, height, hor_texts, ver_texts, margin=0):
 

     fnt = get_font(fontsize)

 

-    color_active = (0, 0, 0)

-    color_inactive = (153, 153, 153)

-

     pad_left = 0 if sum([sum([len(line.text) for line in lines]) for lines in ver_texts]) == 0 else width * 3 // 4

 

     cols = im.width // width

@@ -179,7 +176,7 @@ def draw_grid_annotations(im, width, height, hor_texts, ver_texts, margin=0):
     assert cols == len(hor_texts), f'bad number of horizontal texts: {len(hor_texts)}; must be {cols}'

     assert rows == len(ver_texts), f'bad number of vertical texts: {len(ver_texts)}; must be {rows}'

 

-    calc_img = Image.new("RGB", (1, 1), "white")

+    calc_img = Image.new("RGB", (1, 1), ImageColor.getcolor(opts.grid_background, 'RGB'))

     calc_d = ImageDraw.Draw(calc_img)

 

     for texts, allowed_width in zip(hor_texts + ver_texts, [width] * len(hor_texts) + [pad_left] * len(ver_texts)):

@@ -200,7 +197,7 @@ def draw_grid_annotations(im, width, height, hor_texts, ver_texts, margin=0):
 

     pad_top = 0 if sum(hor_text_heights) == 0 else max(hor_text_heights) + line_spacing * 2

 

-    result = Image.new("RGB", (im.width + pad_left + margin * (cols-1), im.height + pad_top + margin * (rows-1)), "white")

+    result = Image.new("RGB", (im.width + pad_left + margin * (cols-1), im.height + pad_top + margin * (rows-1)), ImageColor.getcolor(opts.grid_background, 'RGB'))

 

     for row in range(rows):

         for col in range(cols):