render: disable background images for text displays

If scale:M isn't set, then we cannot usefully do background images, so
don't even try.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/python/render-present.py b/python/render-present.py
index 18d8b61a3cb83d91555cc66407c02e22e81deaef..2b7b766ba3da70cfde17b48c25b6973cf345b914 100644 (file)
--- a/python/render-present.py
+++ b/python/render-present.py
@@ -455,17 +455,18 @@ class PresenterPane(edlib.Pane):
 
     def handle_present_bg(self, key, focus, mark, **a):
         "handle-prefix:Present-BG:"
+        s = self["scale:M"]
         cmds = key[11:].split(',')
         ret = 0
         for c in cmds:
             rv = None
             if c[:6] == 'color:':
                 rv = focus.call('Draw:clear', 'bg:' + c[6:])
-            if c[:14] == "image-stretch:":
+            if s and c[:14] == "image-stretch:":
                 rv = focus.call('Draw:image', 16, "file:" + self.pathto(c[14:]))
-            if c[:6] == "image:":
+            if s and c[:6] == "image:":
                 rv = focus.call('Draw:image', 4+1, "file:" + self.pathto(c[6:])) # centre
-            if c[:8] == "overlay:":
+            if s and c[:8] == "overlay:":
                 rv = focus.call('Draw:image', 0+2, "file:" + self.pathto(c[8:])) # top right
             if c == "page-local":
                 page = self.find_pages(mark)