CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-05-17 03:12:27 +12:00
Code Issues Projects Releases Wiki Activity

Fixed issue #957 enforcing types supported by spec for QColor

Browse source 
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
This commit is contained in:
TheJackiMonster 2021-11-04 00:50:44 +01:00
parent f6741710ea
commit 15edb6efb7
No known key found for this signature in database
GPG key ID: D850A5F772E880F9
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
manuskript/functions/__init__.py
View file

@ -172,24 +172,25 @@ def randomColor(mix=None):
b = randint(0, 255)
if mix:
r = (r + mix.red()) / 2
g = (g + mix.green()) / 2
b = (b + mix.blue()) / 2
r = int((r + mix.red()) / 2)
g = int((g + mix.green()) / 2)
b = int((b + mix.blue()) / 2)
return QColor(r, g, b)
def mixColors(col1, col2, f=.5):
def mixColors(col1, col2, f=0.5):
fromString = False
if type(col1) == str:
fromString = True
col1 = QColor(col1)
if type(col2) == str:
col2 = QColor(col2)
f2 = 1-f
r = col1.red() * f + col2.red() * f2
g = col1.green() * f + col2.green() * f2
b = col1.blue() * f + col2.blue() * f2
f2 = 1.0 - f
r = int(col1.red() * f + col2.red() * f2)
g = int(col1.green() * f + col2.green() * f2)
b = int(col1.blue() * f + col2.blue() * f2)
return QColor(r, g, b) if not fromString else QColor(r, g, b).name()