Merge branch 'develop'

This commit is contained in:
Olivier Keshavjee 2016-02-28 09:05:35 +01:00
commit 53ebecb4a1

View file

@ -280,9 +280,13 @@ class fullScreenEditor(QWidget):
self.lblWC.setText(self.tr("{} words").format(wc))
self.locker.setWordCount(wc)
# If there's a goal, then we update the locker target's number of word accordingly
# (also if there is a word count, we deduce it.
if goal and not self.locker.isLocked():
if goal - wc > 0:
if wc and goal - wc > 0:
self.locker.spnWordTarget.setValue(goal - wc)
elif not wc:
self.locker.spnWordTarget.setValue(goal)
class myScrollBar(QScrollBar):