mirror of
https://github.com/python/cpython.git
synced 2025-10-17 04:08:28 +00:00
From: "Fredrik Lundh" <fredrik@pythonware.com>
Date: Fri, 7 Aug 1998 13:37:12 +0100 the "initialcolor" code is broken in several places in the current version of tkColorChooser. I've attached an up- dated version for 1.5.2.
This commit is contained in:
parent
a42c1ee21d
commit
5ff1761d3f
1 changed files with 7 additions and 5 deletions
|
@ -9,6 +9,8 @@
|
|||
#
|
||||
# written by Fredrik Lundh, May 1997
|
||||
#
|
||||
# fixed initialcolor handling in August 1998
|
||||
#
|
||||
|
||||
#
|
||||
# options (all have default values):
|
||||
|
@ -21,10 +23,6 @@
|
|||
# - title: dialog title
|
||||
#
|
||||
|
||||
# FIXME: as of Tk 8.0a2, the Unix colour picker is really ugly, and
|
||||
# doesn't seem to work properly on true colour displays. maybe we
|
||||
# should use the instant python version instead?
|
||||
|
||||
from tkCommonDialog import Dialog
|
||||
|
||||
|
||||
|
@ -42,7 +40,7 @@ class Chooser(Dialog):
|
|||
color = self.options["initialcolor"]
|
||||
if type(color) == type(()):
|
||||
# assume an RGB triplet
|
||||
self.options["initialcolor"] = "%02x%02x%02x" % color
|
||||
self.options["initialcolor"] = "#%02x%02x%02x" % color
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
|
@ -61,6 +59,10 @@ class Chooser(Dialog):
|
|||
def askcolor(color = None, **options):
|
||||
"Ask for a color"
|
||||
|
||||
if color:
|
||||
options = options.copy()
|
||||
options["initialcolor"] = color
|
||||
|
||||
return apply(Chooser, (), options).show()
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue