[squeak-dev] The Trunk: System-mt.1386.mczcommits at source.squeak.org commits at source.squeak.orgThu Jan 26 14:57:53 UTC 2023
Marcel Taeumel uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-mt.1386.mcz ==================== Summary ==================== Name: System-mt.1386 Author: mt Time: 26 January 2023, 3:57:50.818707 pm UUID: e7300c66-01f4-8144-aa96-1dec788404a3 Ancestors: System-mt.1385 Complements Morphic-mt.2079. Fixes color issue in Trim theme concerning tree highlights. =============== Diff against System-mt.1385 =============== Item was changed: ----- Method: CommunityTheme class>>addDarkScrollables: (in category 'instance creation') ----- addDarkScrollables: aUserInterfaceTheme "self createDark apply." "Scroll bars" aUserInterfaceTheme set: #thumbColor for: #ScrollBar to: self dbGray; set: #thumbBorderColor for: #ScrollBar to: self dbGray twiceDarker. "Scroll panes (includes generic stuff for list widgets, tree widgets, and text widgets." aUserInterfaceTheme set: #borderColor for: #ScrollPane to: (Color transparent) ; "So the search box isn't outlined." set: #color for: #ScrollPane to: self dbBackground. "List widgets" aUserInterfaceTheme set: #textColor for: #PluggableListMorph to: (Color gray: 0.9); set: #selectionColor for: #PluggableListMorph to: self dbSelection; set: #selectionTextColor for: #PluggableListMorph to: Color white ; derive: #multiSelectionColor for: #PluggableListMorph from: #PluggableListMorph at: #selectionColor do: [:c | c twiceDarker]; set: #filterColor for: #PluggableListMorph to: (self dbYellow alpha: 0.4); derive: #filterTextColor for: #PluggableListMorph from: #PluggableListMorph at: #textColor ; set: #preSelectionModifier for: #PluggableListMorph to: [ [:c | c twiceDarker ] ]; set: #hoverSelectionModifier for: #PluggableListMorph to: [ [:c | c twiceDarker alpha: 0.5 ] ]. "Tree widgets" aUserInterfaceTheme set: #highlightTextColor for: #SimpleHierarchicalListMorph to: self dbYellow lighter lighter; + set: #lineColor for: #SimpleHierarchicalListMorph to: Color gray; + set: #toggleColor for: #SimpleHierarchicalListMorph to: (Color gray: 0.9). - set: #lineColor for: #SimpleHierarchicalListMorph to: Color gray. "Text widgets" aUserInterfaceTheme set: #textColor for: #PluggableTextMorph to: (Color gray: 0.9); set: #caretColor for: #PluggableTextMorph to: Color orange darker; set: #selectionColor for: #PluggableTextMorph to: (self dbSelection duller duller); set: #unfocusedSelectionModifier for: #PluggableTextMorph to: [ [:c | c duller] ]; set: #adornmentReadOnly for: #PluggableTextMorph to: self dbPurple; set: #adornmentRefuse for: #PluggableTextMorph to: self dbBlue; set: #adornmentConflict for: #PluggableTextMorph to: self dbRed; set: #adornmentDiff for: #PluggableTextMorph to: self dbGreen; set: #adornmentNormalEdit for: #PluggableTextMorph to: self dbOrange; set: #adornmentDiffEdit for: #PluggableTextMorph to: self dbYellow; set: #frameAdornmentWidth for: #PluggableTextMorph to: 2. aUserInterfaceTheme set: #balloonTextColor for: #PluggableTextMorphPlus to: self dbComment! Item was changed: ----- Method: MonokaiTheme class>>addDarkScrollables: (in category 'instance creation') ----- addDarkScrollables: theme "self createDark apply." "Scroll bars" theme set: #thumbColor for: #ScrollBar to: self backgroundColor; set: #thumbBorderColor for: #ScrollBar to: self backgroundColor; set: #thumbBorderWidth for: #ScrollBar to: 1; set: #thumbColorModifier for: #ScrollBar to: [ [:c | c adjustBrightness: -0.2] ]; set: #pagingAreaColorModifier for: #ScrollBar to: [ [:c | Color transparent ] ]; set: #borderColorModifier for: #ScrollBar to: [ [:c | c adjustBrightness: -0.2] ]. "Scroll panes (includes generic stuff for list widgets, tree widgets, and text widgets." theme set: #borderWidth for: #ScrollPane to: 0; " set: #borderColor for: #ScrollPane to: Color transparent;" set: #color for: #ScrollPane to: self backgroundColor. "List widgets" theme set: #textColor for: #PluggableListMorph to: self foregroundColor; set: #selectionColor for: #PluggableListMorph to: self invisibleColor; set: #selectionTextColor for: #PluggableListMorph to: self yellow; set: #filterColor for: #PluggableListMorph to: self yellow; set: #filterTextColor for: #PluggableListMorph to: self backgroundColor; set: #preSelectionModifier for: #PluggableListMorph to: [ [:c | c lighter alpha: 0.5 ] ]; set: #hoverSelectionModifier for: #PluggableListMorph to: [ [:c | c lighter alpha: 0.5 ] ]. "Tree widgets" theme set: #highlightTextColor for: #SimpleHierarchicalListMorph to: self yellow lighter lighter; + set: #lineColor for: #SimpleHierarchicalListMorph to: self grayLight; + set: #toggleColor for: #SimpleHierarchicalListMorph to: self grayLightest. - set: #lineColor for: #SimpleHierarchicalListMorph to: self grayLight. "Text widgets" theme set: #textColor for: #PluggableTextMorph to: self foregroundColor; set: #caretColor for: #PluggableTextMorph to: self yellow; set: #selectionColor for: #PluggableTextMorph to: self invisibleColor; set: #unfocusedSelectionModifier for: #PluggableTextMorph to: [ [:c | (Color r: 0.285 g: 0.282 b: 0.242) "invisible color"] ]; set: #adornmentReadOnly for: #PluggableTextMorph to: self magenta; set: #adornmentRefuse for: #PluggableTextMorph to: self cyan; set: #adornmentConflict for: #PluggableTextMorph to: self red; set: #adornmentDiff for: #PluggableTextMorph to: self green; set: #adornmentNormalEdit for: #PluggableTextMorph to: self orange; set: #adornmentDiffEdit for: #PluggableTextMorph to: self yellow. theme set: #balloonTextColor for: #PluggableTextMorphPlus to: self grayLight.! Item was changed: ----- Method: SolarizedTheme class>>addDarkScrollables: (in category 'instance creation') ----- addDarkScrollables: theme "self createDark apply." "Scroll bars" theme set: #thumbColor for: #ScrollBar to: self darkBackground; set: #thumbBorderColor for: #ScrollBar to: self darkBackground; set: #thumbBorderWidth for: #ScrollBar to: 1; set: #thumbColorModifier for: #ScrollBar to: [ [:c | c adjustBrightness: -0.1] ]; set: #pagingAreaColorModifier for: #ScrollBar to: [ [:c | Color transparent ] ]; set: #borderColorModifier for: #ScrollBar to: [ [:c | c adjustBrightness: -0.1] ]. "Scroll panes (includes generic stuff for list widgets, tree widgets, and text widgets." theme set: #borderWidth for: #ScrollPane to: 0; " set: #borderColor for: #ScrollPane to: Color transparent;" set: #color for: #ScrollPane to: self darkBackground. "List widgets" theme set: #textColor for: #PluggableListMorph to: self darkContentEmphasized; set: #selectionColor for: #PluggableListMorph to: self darkSelectionColor; set: #selectionTextColor for: #PluggableListMorph to: self darkSelectionTextColor; set: #filterColor for: #PluggableListMorph to: self yellow; set: #filterTextColor for: #PluggableListMorph to: self base03; set: #preSelectionModifier for: #PluggableListMorph to: [ [:c | c lighter alpha: 0.5 ] ]; set: #hoverSelectionModifier for: #PluggableListMorph to: [ [:c | c lighter alpha: 0.5 ] ]. "Tree widgets" theme set: #highlightTextColor for: #SimpleHierarchicalListMorph to: self yellow lighter lighter; + set: #lineColor for: #SimpleHierarchicalListMorph to: self darkBackgroundHighlights; + set: #toggleColor for: #SimpleHierarchicalListMorph to: self darkContentSecondary. - set: #lineColor for: #SimpleHierarchicalListMorph to: self darkContentSecondary. "Text widgets" theme set: #textColor for: #PluggableTextMorph to: self darkContentPrimary; set: #caretColor for: #PluggableTextMorph to: self darkContentEmphasizedMore; set: #selectionColor for: #PluggableTextMorph to: self darkSelectionColor; set: #unfocusedSelectionModifier for: #PluggableTextMorph to: [ [:c | c darker ] ]; set: #adornmentReadOnly for: #PluggableTextMorph to: self magenta; set: #adornmentRefuse for: #PluggableTextMorph to: self cyan; set: #adornmentConflict for: #PluggableTextMorph to: self red; set: #adornmentDiff for: #PluggableTextMorph to: self green; set: #adornmentNormalEdit for: #PluggableTextMorph to: self orange; set: #adornmentDiffEdit for: #PluggableTextMorph to: self yellow. theme set: #balloonTextColor for: #PluggableTextMorphPlus to: self darkContentSecondary.! Item was changed: ----- Method: SolarizedTheme class>>addLightScrollables: (in category 'instance creation') ----- addLightScrollables: theme "self createLight apply." "Scroll bars" theme set: #thumbColor for: #ScrollBar to: self lightBackground; set: #thumbBorderColor for: #ScrollBar to: self lightBackground; set: #thumbBorderWidth for: #ScrollBar to: 1; set: #thumbColorModifier for: #ScrollBar to: [ [:c | c adjustBrightness: -0.1] ]; set: #pagingAreaColorModifier for: #ScrollBar to: [ [:c | Color transparent ] ]; set: #borderColorModifier for: #ScrollBar to: [ [:c | c adjustBrightness: -0.1] ]. "Scroll panes (includes generic stuff for list widgets, tree widgets, and text widgets." theme set: #borderWidth for: #ScrollPane to: 0; " set: #borderColor for: #ScrollPane to: Color transparent;" set: #color for: #ScrollPane to: self lightBackground. "List widgets" theme set: #textColor for: #PluggableListMorph to: self lightContentEmphasized; set: #selectionColor for: #PluggableListMorph to: self lightBackgroundHighlights darker; set: #selectionTextColor for: #PluggableListMorph to: self lightContentEmphasizedMore; derive: #multiSelectionColor for: #PluggableListMorph from: #PluggableListMorph at: #selectionColor do: [:c | c darker]; set: #filterColor for: #PluggableListMorph to: self yellow; set: #filterTextColor for: #PluggableListMorph to: self lightBackground; set: #preSelectionModifier for: #PluggableListMorph to: [ [:c | c darker alpha: 0.5 ] ]; set: #hoverSelectionModifier for: #PluggableListMorph to: [ [:c | c darker alpha: 0.5 ] ]. "Tree widgets" theme set: #highlightTextColor for: #SimpleHierarchicalListMorph to: self yellow lighter lighter; + set: #lineColor for: #SimpleHierarchicalListMorph to: self lightBackgroundHighlights; + set: #toggleColor for: #SimpleHierarchicalListMorph to: self lightContentSecondary. - set: #lineColor for: #SimpleHierarchicalListMorph to: self lightContentSecondary. "Text widgets" theme set: #textColor for: #PluggableTextMorph to: self lightContentPrimary; set: #caretColor for: #PluggableTextMorph to: self lightContentEmphasizedMore; set: #selectionColor for: #PluggableTextMorph to: self lightBackgroundHighlights darker; set: #unfocusedSelectionModifier for: #PluggableTextMorph to: [ [:c | (Color r: 0.933 g: 0.909 b: 0.835) "light background highlights"] ]; set: #adornmentReadOnly for: #PluggableTextMorph to: self magenta; set: #adornmentRefuse for: #PluggableTextMorph to: self cyan; set: #adornmentConflict for: #PluggableTextMorph to: self red; set: #adornmentDiff for: #PluggableTextMorph to: self green; set: #adornmentNormalEdit for: #PluggableTextMorph to: self orange; set: #adornmentDiffEdit for: #PluggableTextMorph to: self yellow. theme set: #balloonTextColor for: #PluggableTextMorphPlus to: self lightContentSecondary.! Item was changed: ----- Method: SqueakTheme class>>addDullerScrollables: (in category 'instance creation') ----- addDullerScrollables: theme "self createDuller apply" theme + set: #filterColor for: #PluggableListMorph to: Color yellow paler duller; + set: #lineColor for: #SimpleHierarchicalListMorph to: Color veryVeryLightGray duller; + set: #toggleColor for: #SimpleHierarchicalListMorph to: Color lightGray duller.! - set: #filterColor for: #PluggableListMorph to: Color yellow paler duller.! Item was changed: ----- Method: SqueakTheme class>>addScrollables: (in category 'instance creation') ----- addScrollables: theme "self create apply" "Sliders" theme set: #borderColor for: #Slider to: Color gray; set: #borderWidth for: #Slider to: 1; set: #color for: #Slider to: Color lightGray; set: #thumbBorderColor for: #Slider to: [Color gray: 0.6]; set: #thumbBorderWidth for: #Slider to: 0; set: #thumbColor for: #Slider to: Color veryVeryLightGray; set: #thumbShadowModifier for: #Slider to: [ [:c | c alpha: 0.7] ]. "Scroll bars" theme set: #thumbBorderWidth for: #ScrollBar to: 1; set: #thumbColorModifier for: #ScrollBar to: [ [:c | c] ]; set: #pagingAreaColorModifier for: #ScrollBar to: [ [:c | c darker alpha: 0.35] ]; set: #borderColorModifier for: #ScrollBar to: [ [:c | c adjustBrightness: -0.3] ]. "Scroll panes (includes generic stuff for list widgets, tree widgets, and text widgets." theme set: #borderColor for: #ScrollPane to: (Color gray: 0.6); set: #borderWidth for: #ScrollPane to: 1; set: #borderStyle for: #ScrollPane to: BorderStyle simple; set: #color for: #ScrollPane to: Color white. "List widgets" theme set: #font for: #PluggableListMorph to: [Preferences standardListFont]; set: #textColor for: #PluggableListMorph to: Color black; set: #selectionColor for: #PluggableListMorph to: (Color r: 0.72 g: 0.72 b: 0.9); derive: #multiSelectionColor for: #PluggableListMorph from: #PluggableListMorph at: #selectionColor do: [:c | c lighter]; set: #selectionTextColor for: #PluggableListMorph to: Color black; set: #filterColor for: #PluggableListMorph to: Color yellow paler; set: #filterTextColor for: #PluggableListMorph to: Color black; set: #preSelectionModifier for: #PluggableListMorph to: [ [:c | Color gray: 0.9] ]; set: #hoverSelectionModifier for: #PluggableListMorph to: [ [:c | c darker alpha: 0.3] ]. "Tree widgets" theme derive: #font for: #SimpleHierarchicalListMorph from: #PluggableListMorph; derive: #textColor for: #SimpleHierarchicalListMorph from: #PluggableListMorph; derive: #selectionColor for: #SimpleHierarchicalListMorph from: #PluggableListMorph; derive: #selectionTextColor for: #SimpleHierarchicalListMorph from: #PluggableListMorph; derive: #filterColor for: #SimpleHierarchicalListMorph from: #PluggableListMorph; derive: #filterTextColor for: #SimpleHierarchicalListMorph from: #PluggableListMorph; derive: #hoverSelectionModifier for: #SimpleHierarchicalListMorph from: #PluggableListMorph; set: #highlightTextColor for: #SimpleHierarchicalListMorph to: Color fern; + set: #lineColor for: #SimpleHierarchicalListMorph to: Color veryVeryLightGray; + set: #toggleColor for: #SimpleHierarchicalListMorph to: Color lightGray. - set: #lineColor for: #SimpleHierarchicalListMorph to: Color veryLightGray. "Text widgets" theme set: #font for: #PluggableTextMorph to: [TextStyle defaultFont]; set: #textStyle for: #PluggableTextMorph to: [TextStyle default]; set: #textStyleFixed for: #PluggableTextMorph to: [TextStyle defaultFixed]; set: #textColor for: #PluggableTextMorph to: Color black; set: #caretColor for: #PluggableTextMorph to: Color red; set: #selectionColor for: #PluggableTextMorph to: (TranslucentColor r: 0.0 g: 0.0 b: 0.8 alpha: 0.2); set: #unfocusedSelectionModifier for: #PluggableTextMorph to: [ [:c | Color gray: 0.9] ]; set: #adornmentReadOnly for: #PluggableTextMorph to: Color black; set: #adornmentRefuse for: #PluggableTextMorph to: Color tan; set: #adornmentConflict for: #PluggableTextMorph to: Color red; set: #adornmentDiff for: #PluggableTextMorph to: Color green; set: #adornmentNormalEdit for: #PluggableTextMorph to: Color orange; set: #adornmentDiffEdit for: #PluggableTextMorph to: Color yellow; set: #frameAdornmentWidth for: #PluggableTextMorph to: 1. theme set: #balloonTextColor for: #PluggableTextMorphPlus to: (Color gray: 0.7); derive: #balloonTextFont for: #PluggableTextMorphPlus from: #PluggableTextMorph at: #font.! Item was changed: ----- Method: TrimTheme class>>addScrollables: (in category 'instance creation') ----- addScrollables: theme "self create apply" "Sliders" theme set: #borderColor for: #Slider to: self gray76; set: #borderWidth for: #Slider to: 1; set: #color for: #Slider to: self gray61; set: #thumbBorderColor for: #Slider to: self gray61; set: #thumbBorderWidth for: #Slider to: 1; set: #thumbColor for: #Slider to: self gray128; set: #thumbShadowModifier for: #Slider to: [ [:c | c alpha: 0.7] ]. "Scroll bars" theme set: #thumbBorderWidth for: #ScrollBar to: 1; set: #thumbColorModifier for: #ScrollBar to: [ [:c | c adjustBrightness: 0.2] ]; "set: #pagingAreaColorModifier for: #ScrollBar to: [ [:c | self gray51] ];" set: #borderColorModifier for: #ScrollBar to: [ [:c | c adjustBrightness: 0.2] ]. "Scroll panes (includes generic stuff for list widgets, tree widgets, and text widgets." theme set: #borderColor for: #ScrollPane to: self gray76; set: #borderWidth for: #ScrollPane to: 1; set: #borderStyle for: #ScrollPane to: BorderStyle simple; set: #color for: #ScrollPane to: self gray51. "List widgets" theme set: #textColor for: #PluggableListMorph to: self white; set: #selectionColor for: #PluggableListMorph to: self blue; derive: #multiSelectionColor for: #PluggableListMorph from: #PluggableListMorph at: #selectionColor do: [:c | c lighter]; set: #selectionTextColor for: #PluggableListMorph to: self white; set: #filterColor for: #PluggableListMorph to: self orange; set: #filterTextColor for: #PluggableListMorph to: self white; set: #preSelectionModifier for: #PluggableListMorph to: [ [:c | c alpha: 0.3] ]; set: #hoverSelectionModifier for: #PluggableListMorph to: [ [:c | c darker alpha: 0.3] ]. "Tree widgets" theme + set: #highlightTextColor for: #SimpleHierarchicalListMorph to: self red; + set: #lineColor for: #SimpleHierarchicalListMorph to: self gray102; + set: #toggleColor for: #SimpleHierarchicalListMorph to: self gray168. - set: #higlightTextColor for: #SimpleHierarchicalListMorph to: self red; - set: #lineColor for: #SimpleHierarchicalListMorph to: self gray168. "Text widgets" theme set: #textColor for: #PluggableTextMorph to: self white; set: #caretColor for: #PluggableTextMorph to: self white; set: #selectionColor for: #PluggableTextMorph to: (self blue alpha: 0.4); set: #unfocusedSelectionModifier for: #PluggableTextMorph to: [ [:c | self blue alpha: 0.3] ]; set: #adornmentReadOnly for: #PluggableTextMorph to: self black; set: #adornmentRefuse for: #PluggableTextMorph to: self blue; set: #adornmentConflict for: #PluggableTextMorph to: self red; set: #adornmentDiff for: #PluggableTextMorph to: self green; set: #adornmentNormalEdit for: #PluggableTextMorph to: self orange; set: #adornmentDiffEdit for: #PluggableTextMorph to: self yellow; set: #frameAdornmentWidth for: #PluggableTextMorph to: 1. theme set: #balloonTextColor for: #PluggableTextMorphPlus to: self gray102.! Item was changed: + (PackageInfo named: 'System') postscript: 'UserInterfaceTheme cleanUpAndReset.'! - (PackageInfo named: 'System') postscript: '"Update UserInterfaceTheme instances (System-ct.1367)" - UserInterfaceTheme allSubInstancesDo: [:theme | - theme atomicUpdate: [:props | - props copy keysAndValuesDo: [:key :value | - (key isKindOf: Association) ifTrue: [ - props - removeKey: key; - at: {key key. key value} put: value]]]].'!
More information about the Squeak-dev mailing list |