forked from openlp/openlp
Stop outlines for footers they are too small
This commit is contained in:
parent
8df0053409
commit
66cd5f042a
@ -543,7 +543,7 @@ class Renderer(object):
|
|||||||
else:
|
else:
|
||||||
pen = QtGui.QColor(color)
|
pen = QtGui.QColor(color)
|
||||||
x, y = tlcorner
|
x, y = tlcorner
|
||||||
if self._theme.display_outline and outline_size != 0:
|
if self._theme.display_outline and outline_size != 0 and not footer:
|
||||||
path = QtGui.QPainterPath()
|
path = QtGui.QPainterPath()
|
||||||
path.addText(QtCore.QPointF(x, y + metrics.ascent()), font, line)
|
path.addText(QtCore.QPointF(x, y + metrics.ascent()), font, line)
|
||||||
self.painter.setBrush(self.painter.pen().brush())
|
self.painter.setBrush(self.painter.pen().brush())
|
||||||
@ -554,7 +554,7 @@ class Renderer(object):
|
|||||||
self.painter.drawText(x, y + metrics.ascent(), line)
|
self.painter.drawText(x, y + metrics.ascent(), line)
|
||||||
if self._theme.display_slideTransition:
|
if self._theme.display_slideTransition:
|
||||||
# Print 2nd image with 70% weight
|
# Print 2nd image with 70% weight
|
||||||
if self._theme.display_outline and outline_size != 0:
|
if self._theme.display_outline and outline_size != 0 and not footer:
|
||||||
path = QtGui.QPainterPath()
|
path = QtGui.QPainterPath()
|
||||||
path.addText(QtCore.QPointF(x, y + metrics.ascent()), font, line)
|
path.addText(QtCore.QPointF(x, y + metrics.ascent()), font, line)
|
||||||
self.painter2.setBrush(self.painter2.pen().brush())
|
self.painter2.setBrush(self.painter2.pen().brush())
|
||||||
|
@ -659,11 +659,17 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
self.repaintServiceList(sitem + 1, 0)
|
self.repaintServiceList(sitem + 1, 0)
|
||||||
self.parent.LiveController.replaceServiceManagerItem(item)
|
self.parent.LiveController.replaceServiceManagerItem(item)
|
||||||
else:
|
else:
|
||||||
#nothing selected or dnd
|
#nothing selected for dnd
|
||||||
if self.droppos == 0:
|
if self.droppos == 0:
|
||||||
self.serviceItems.append({u'service_item': item,
|
if isinstance(item, list):
|
||||||
u'order': len(self.serviceItems) + 1,
|
for inditem in item:
|
||||||
u'expanded':expand})
|
self.serviceItems.append({u'service_item': inditem,
|
||||||
|
u'order': len(self.serviceItems) + 1,
|
||||||
|
u'expanded':expand})
|
||||||
|
else:
|
||||||
|
self.serviceItems.append({u'service_item': item,
|
||||||
|
u'order': len(self.serviceItems) + 1,
|
||||||
|
u'expanded':expand})
|
||||||
self.repaintServiceList(len(self.serviceItems) + 1, 0)
|
self.repaintServiceList(len(self.serviceItems) + 1, 0)
|
||||||
else:
|
else:
|
||||||
self.serviceItems.insert(self.droppos, {u'service_item': item,
|
self.serviceItems.insert(self.droppos, {u'service_item': item,
|
||||||
|
Loading…
Reference in New Issue
Block a user