save current color so it can be reverted on cancel
This commit is contained in:
committed by
Yorik van Havre
parent
012db7a0b1
commit
51fdef4193
@@ -1314,8 +1314,10 @@ class DraftToolBar:
|
||||
|
||||
def getcol(self):
|
||||
"opens a color picker dialog"
|
||||
oldColor = self.color
|
||||
self.color=QtGui.QColorDialog.getColor()
|
||||
if not QtGui.QColor.isValid(self.color): #user canceled
|
||||
self.color = oldColor
|
||||
return
|
||||
self.colorPix.fill(self.color)
|
||||
self.colorButton.setIcon(QtGui.QIcon(self.colorPix))
|
||||
@@ -1336,8 +1338,10 @@ class DraftToolBar:
|
||||
|
||||
def getfacecol(self):
|
||||
"opens a color picker dialog"
|
||||
oldColor = self.facecolor
|
||||
self.facecolor=QtGui.QColorDialog.getColor()
|
||||
if not QtGui.QColor.isValid(self.facecolor): #user canceled
|
||||
self.facecolor = oldColor
|
||||
return
|
||||
self.facecolorPix.fill(self.facecolor)
|
||||
self.facecolorButton.setIcon(QtGui.QIcon(self.facecolorPix))
|
||||
|
||||
Reference in New Issue
Block a user