1) color literals are now in all caps 2) changed the way color litera…

…ls are noted/created 3) changing how color regex is created in LiveCodeLab
davidedc · Jun 24, 2020 · 8b27457 · 8b27457
1 parent c4a73e1
commit 8b27457
Show file tree

Hide file tree

Showing 53 changed files with 247 additions and 242 deletions.
diff --git a/src/BasementOpenerWdgt.coffee b/src/BasementOpenerWdgt.coffee
@@ -4,7 +4,7 @@ class BasementOpenerWdgt extends IconicDesktopSystemLinkWdgt
 
   color_hover: new Color 90, 90, 90
   color_pressed: new Color 128, 128, 128
-  color_normal: Color.black
+  color_normal: Color.BLACK
 
   _acceptsDrops: true
 

diff --git a/src/CodeInjectingSimpleRectangularButtonMorph.coffee b/src/CodeInjectingSimpleRectangularButtonMorph.coffee
@@ -14,7 +14,7 @@ class CodeInjectingSimpleRectangularButtonMorph extends SimpleRectangularButtonM
 
   constructor: (@wdgtToBeNotifiedForNewCode, @wdgtWhereToInject, face) ->
     super true, @, 'injectCodeIntoTarget', face
-    @strokeColor = Color.black
+    @strokeColor = Color.BLACK
     @setColor new Color 150, 150, 150
     @toolTipMessage = face.toolTipMessage
 

diff --git a/src/CodePromptMorph.coffee b/src/CodePromptMorph.coffee
@@ -35,7 +35,7 @@ class CodePromptMorph extends Widget
     @tempPromptEntryField = new SimplePlainTextScrollPanelWdgt @defaultContents, false, 5
     @tempPromptEntryField.disableDrops()
     @tempPromptEntryField.contents.disableDrops()
-    @tempPromptEntryField.color = Color.white
+    @tempPromptEntryField.color = Color.WHITE
     @tempPromptEntryField.addModifiedContentIndicator()
 
     # register this wdgt as one to be notified when the text
@@ -44,7 +44,7 @@ class CodePromptMorph extends Widget
     @tempPromptEntryField.widgetToBeNotifiedOfTextModificationChange = @
 
     @textMorph = @tempPromptEntryField.textWdgt
-    @textMorph.backgroundColor = Color.transparent
+    @textMorph.backgroundColor = Color.TRANSPARENT
     @textMorph.setFontName nil, nil, @textMorph.monoFontStack
     @textMorph.isEditable = true
     @textMorph.enableSelecting()
@@ -73,7 +73,7 @@ class CodePromptMorph extends Widget
     @invalidateLayout()
 
   textContentModified: ->
-    @saveTextWdgt.setColor Color.black
+    @saveTextWdgt.setColor Color.BLACK
 
   textContentUnmodified: ->
     @saveTextWdgt.setColor new Color 200, 200, 200

diff --git a/src/ColorPickerMorph.coffee b/src/ColorPickerMorph.coffee
@@ -17,10 +17,10 @@ class ColorPickerMorph extends Widget
   colorPalette: nil
   grayPalette: nil
 
-  constructor: ( @choice = Color.white ) ->    
+  constructor: ( @choice = Color.WHITE ) ->    
     super()
     @appearance = new RectangularAppearance @
-    @color = Color.white
+    @color = Color.WHITE
     @rawSetExtent new Point 80, 80
     @buildSubmorphs()
 

diff --git a/src/EmptyButtonMorph.coffee b/src/EmptyButtonMorph.coffee
@@ -32,7 +32,7 @@ class EmptyButtonMorph extends Widget
 
 
   # overrides to superclass
-  color: Color.white
+  color: Color.WHITE
 
   constructor: (
       @ifInsidePopUpThenClosesUnpinnedPopUpsWhenClicked = true,
@@ -58,7 +58,7 @@ class EmptyButtonMorph extends Widget
     @defaultRejectDrags = true
 
     #@color = new Color 255, 152, 152
-    #@color = Color.white
+    #@color = Color.WHITE
     if @faceMorph?
 
       if (typeof @faceMorph) == "string"

diff --git a/src/ErrorsLogViewerMorph.coffee b/src/ErrorsLogViewerMorph.coffee
@@ -64,10 +64,10 @@ class ErrorsLogViewerMorph extends Widget
     @tempPromptEntryField = new SimplePlainTextScrollPanelWdgt @defaultContents, false, 5
     @tempPromptEntryField.disableDrops()
     @tempPromptEntryField.contents.disableDrops()
-    @tempPromptEntryField.color = Color.white
+    @tempPromptEntryField.color = Color.WHITE
 
     @textMorph = @tempPromptEntryField.textWdgt
-    @textMorph.backgroundColor = Color.transparent
+    @textMorph.backgroundColor = Color.TRANSPARENT
     @textMorph.setFontName nil, nil, @textMorph.monoFontStack
     @textMorph.isEditable = true
     @textMorph.enableSelecting()

diff --git a/src/HandleMorph.coffee b/src/HandleMorph.coffee
@@ -23,7 +23,7 @@ class HandleMorph extends Widget
     else
       @inset = new Point minimumPadding, minimumPadding
     super()
-    @color = Color.white
+    @color = Color.WHITE
     @noticesTransparentClick = true
     size = WorldMorph.preferencesAndSettings.handleSize
     @silentRawSetExtent new Point size, size
@@ -147,7 +147,7 @@ class HandleMorph extends Widget
     if @state == @STATE_NORMAL
       @handleMorphRenderingHelper aContext, @color, new Color 150, 150, 150
     if @state == @STATE_HIGHLIGHTED
-      @handleMorphRenderingHelper aContext, Color.white, new Color 200, 200, 255
+      @handleMorphRenderingHelper aContext, Color.WHITE, new Color 200, 200, 255
 
     aContext.restore()
 

diff --git a/src/IconicDesktopSystemShortcutWdgt.coffee b/src/IconicDesktopSystemShortcutWdgt.coffee
@@ -20,7 +20,7 @@ class IconicDesktopSystemShortcutWdgt extends IconicDesktopSystemLinkWdgt
 
   color_hover: new Color 90, 90, 90
   color_pressed: new Color 128, 128, 128
-  color_normal: Color.black
+  color_normal: Color.BLACK
 
   reactToDropOf: (droppedWidget) ->
 

diff --git a/src/LayoutElementAdderOrDropletMorph.coffee b/src/LayoutElementAdderOrDropletMorph.coffee
@@ -5,7 +5,7 @@ class LayoutElementAdderOrDropletMorph extends Widget
 
   constructor: ->
     super()
-    @setColor Color.black
+    @setColor Color.BLACK
     @setMinAndMaxBoundsAndSpreadability (new Point 15,15) , (new Point 15,15), LayoutSpec.SPREADABILITY_HANDLES
 
   # This method only paints this very morph's "image",
@@ -40,7 +40,7 @@ class LayoutElementAdderOrDropletMorph extends Widget
     morphPosition = @position()
     aContext.translate morphPosition.x, morphPosition.y
 
-    @spacerMorphRenderingHelper aContext, Color.white, new Color 200, 200, 255
+    @spacerMorphRenderingHelper aContext, Color.WHITE, new Color 200, 200, 255
 
     aContext.restore()
 
@@ -144,6 +144,6 @@ class LayoutElementAdderOrDropletMorph extends Widget
     @setColor new Color 100, 100, 100
 
   mouseLeave: ->
-    @setColor Color.black
+    @setColor Color.BLACK
 
 
diff --git a/src/LayoutSpacerMorph.coffee b/src/LayoutSpacerMorph.coffee
@@ -5,7 +5,7 @@ class LayoutSpacerMorph extends Widget
 
   constructor: (spacerWeight = 1) ->
     super()
-    @setColor Color.black
+    @setColor Color.BLACK
     @setMinAndMaxBoundsAndSpreadability (new Point 0,0) , (new Point 1,1), spacerWeight * LayoutSpec.SPREADABILITY_SPACERS
     @minimumExtent = new Point 0,0
 
@@ -57,7 +57,7 @@ class LayoutSpacerMorph extends Widget
     morphPosition = @position()
     aContext.translate morphPosition.x, morphPosition.y
 
-    @spacerMorphRenderingHelper aContext, Color.white, new Color 200, 200, 255
+    @spacerMorphRenderingHelper aContext, Color.WHITE, new Color 200, 200, 255
 
     aContext.restore()
 

diff --git a/src/ListMorph.coffee b/src/ListMorph.coffee
@@ -46,7 +46,7 @@ class ListMorph extends ScrollPanelWdgt
     #debugger
     super()
     @contents.disableDrops()
-    @color = Color.white
+    @color = Color.WHITE
     @buildAndConnectChildren() # builds the list contents
     # it's important to leave the step as the default noOperation
     # instead of nil because the scrollbars (inherited from ScrollPanel)

diff --git a/src/MouseSensorMorph.coffee b/src/MouseSensorMorph.coffee
@@ -5,7 +5,7 @@ class MouseSensorMorph extends BoxMorph
 
   constructor: (@cornerRadius = 4) ->
     super
-    @color = Color.white
+    @color = Color.WHITE
     @isTouched = false
     @upStep = 0.05
     @downStep = 0.02

diff --git a/src/PreferencesAndSettings.coffee b/src/PreferencesAndSettings.coffee
@@ -80,7 +80,7 @@ class PreferencesAndSettings
     @menuHeaderBold = true # false
     @menuStrokeColor = new Color 210, 210, 210 # new Color 186, 186, 186
     @menuBackgroundColor = new Color 249, 249, 249 # new Color 244, 244, 244
-    @menuButtonsLabelColor = Color.black # new Color 50, 50, 50
+    @menuButtonsLabelColor = Color.BLACK # new Color 50, 50, 50
 
     @externalWindowBarBackgroundColor = new Color 125, 125, 125
     @externalWindowBarStrokeColor = new Color 100,100,100
@@ -107,7 +107,7 @@ class PreferencesAndSettings
     # we use this string so many times
     @outlineColorString = @outlineColor.toString()
 
-    @iconDarkLineColor = Color.black
+    @iconDarkLineColor = Color.BLACK
 
     @shortcutsFontSize = 12
 

diff --git a/src/ScriptWdgt.coffee b/src/ScriptWdgt.coffee
@@ -46,7 +46,7 @@ class ScriptWdgt extends Widget
     @tempPromptEntryField = new SimplePlainTextScrollPanelWdgt @savedScript, false, 5
     @tempPromptEntryField.disableDrops()
     @tempPromptEntryField.contents.disableDrops()
-    @tempPromptEntryField.color = Color.white
+    @tempPromptEntryField.color = Color.WHITE
     @tempPromptEntryField.addModifiedContentIndicator()
 
     # register this wdgt as one to be notified when the text
@@ -55,7 +55,7 @@ class ScriptWdgt extends Widget
     @tempPromptEntryField.widgetToBeNotifiedOfTextModificationChange = @
 
     @textMorph = @tempPromptEntryField.textWdgt
-    @textMorph.backgroundColor = Color.transparent
+    @textMorph.backgroundColor = Color.TRANSPARENT
     @textMorph.setFontName nil, nil, @textMorph.monoFontStack
     @textMorph.isEditable = true
     @textMorph.enableSelecting()

diff --git a/src/SimpleDropletAppearance.coffee b/src/SimpleDropletAppearance.coffee
@@ -54,7 +54,7 @@ class SimpleDropletAppearance extends RectangularAppearance
     plusSignTop = p0.add new Point Math.ceil(squareDim/2), -Math.ceil(squareDim/3)
     plusSignBottom = p0.add new Point Math.ceil(squareDim/2), Math.ceil(squareDim/3)
 
-    color = Color.white
+    color = Color.WHITE
 
     context.save()
 

diff --git a/src/SimpleDropletWdgt.coffee b/src/SimpleDropletWdgt.coffee
@@ -10,15 +10,15 @@ class SimpleDropletWdgt extends Widget
 
   color_hover: new Color 90, 90, 90
   color_pressed: new Color 128, 128, 128
-  color_normal: Color.black
+  color_normal: Color.BLACK
 
   _acceptsDrops: true
   parentFieldToAttachingTheWidgetToAsString: nil
 
   constructor: (@parentFieldToAttachingTheWidgetToAsString) ->
     super()
     @appearance = new SimpleDropletAppearance @
-    @setColor Color.black
+    @setColor Color.BLACK
 
   reactToDropOf: (morphBeingDropped) ->
     # TODO we add as FREEFLOATING if we don't pass

diff --git a/src/SimplePlainTextPanelWdgt.coffee b/src/SimplePlainTextPanelWdgt.coffee
@@ -21,7 +21,7 @@ class SimplePlainTextPanelWdgt extends PanelWdgt
     @disableDrops()
     @disableDrops()
     @isTextLineWrapping = wraps
-    @color = Color.white
+    @color = Color.WHITE
     ostmA = new SimplePlainTextWdgt(
       textAsString,nil,nil,nil,nil,nil,new Color(230, 230, 130), 1)
     ostmA.isEditable = true

diff --git a/src/SimplePlainTextScrollPanelWdgt.coffee b/src/SimplePlainTextScrollPanelWdgt.coffee
@@ -26,7 +26,7 @@ class SimplePlainTextScrollPanelWdgt extends ScrollPanelWdgt
     @disableDrops()
     @contents.disableDrops()
     @isTextLineWrapping = wraps
-    @color = Color.white
+    @color = Color.WHITE
     @textWdgt = new SimplePlainTextWdgt(
       textAsString,nil,nil,nil,nil,nil,new Color(230, 230, 130), 1)
     @textWdgt.isEditable = true

diff --git a/src/SimplePlainTextWdgt.coffee b/src/SimplePlainTextWdgt.coffee
@@ -28,7 +28,7 @@ class SimplePlainTextWdgt extends TextMorph2
    @isBold = false,
    @isItalic = false,
    #@isNumeric = false,
-   @color = Color.black,
+   @color = Color.BLACK,
    @backgroundColor = nil,
    @backgroundTransparency = nil
    ) ->

diff --git a/src/SwitchButtonMorph.coffee b/src/SwitchButtonMorph.coffee
@@ -16,7 +16,7 @@ class SwitchButtonMorph extends Widget
   buttonShown: 0
 
   # overrides to superclass
-  color: Color.white
+  color: Color.WHITE
 
   constructor: (@buttons) ->
 
@@ -25,7 +25,7 @@ class SwitchButtonMorph extends Widget
     super()
 
     #@color = new Color 255, 152, 152
-    #@color = Color.white
+    #@color = Color.WHITE
     for eachButton in @buttons
       @add eachButton
 

diff --git a/src/WidgetHolderWithCaptionWdgt.coffee b/src/WidgetHolderWithCaptionWdgt.coffee
@@ -15,7 +15,7 @@ class WidgetHolderWithCaptionWdgt extends Widget
     @add @icon
     @label = new StringMorph2 @labelContent, WorldMorph.preferencesAndSettings.shortcutsFontSize
     @label.fittingSpecWhenBoundsTooLarge = FittingSpecTextInLargerBounds.SCALEUP
-    @label.color = Color.white
+    @label.color = Color.WHITE
     @label.hasDarkOutline = true
     @add @label, nil, nil, true
     @label.alignCenter()

diff --git a/src/WindowWdgt.coffee b/src/WindowWdgt.coffee
@@ -316,7 +316,7 @@ class WindowWdgt extends SimpleVerticalStackPanelWdgt
     else
       @label.isBold = WorldMorph.preferencesAndSettings.titleBarBoldText
 
-    @label.color = Color.white
+    @label.color = Color.WHITE
     @add @label, nil, nil, nil, true
 
     # upper-left button, often a close button

diff --git a/src/apps/AnalogClockWdgt.coffee b/src/apps/AnalogClockWdgt.coffee
@@ -69,7 +69,7 @@ class AnalogClockWdgt extends Widget
       morphPosition = @position()
       aContext.translate morphPosition.x, morphPosition.y
 
-      @renderingHelper aContext, Color.white, appliedShadow
+      @renderingHelper aContext, Color.WHITE, appliedShadow
 
       aContext.restore()
 

diff --git a/src/apps/ReconfigurablePaintWdgt.coffee b/src/apps/ReconfigurablePaintWdgt.coffee
@@ -402,7 +402,7 @@ class ReconfigurablePaintWdgt extends StretchableEditableWdgt
 
                 contextMain.beginPath()
                 contextMain.lineWidth="2"
-                contextMain.fillStyle = Color.white.toString()
+                contextMain.fillStyle = Color.WHITE.toString()
                 contextMain.rect(-5,-5,10,10)
                 contextMain.fill()
                 @underlyingCanvasMorph.changed()