Skip to content

21864-merge-SHTextStylerST80-and-SHRBTextStyler #1330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarcusDenker merged 1 commit into from
May 11, 2018
Merged

21864-merge-SHTextStylerST80-and-SHRBTextStyler #1330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/NECompletion/NECMenuMorph.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ NECMenuMorph class >> controller: aECController position: aPoint [

{ #category : #preferences }
NECMenuMorph class >> convertToSHSymbol: aSymbol [
^ (SHTextStylerST80 new attributesFor: aSymbol) isNotEmpty
^ (SHRBTextStyler new attributesFor: aSymbol) isNotEmpty
ifTrue: [ aSymbol ]
ifFalse: [ #default ]
]
Expand Down Expand Up @@ -199,13 +199,13 @@ NECMenuMorph class >> sectionAttributes [
NECMenuMorph class >> selectColorFor: aSymbol [
| attribute |
attribute := self convertToSHSymbol: aSymbol.
^ (SHTextStylerST80 new attributesFor: attribute) first color
^ (SHRBTextStyler new attributesFor: attribute) first color
]

{ #category : #'preferences-fonts' }
NECMenuMorph class >> selectFontFor: aSymbol [
| emphasized attributes |
attributes := SHTextStylerST80 new
attributes := SHRBTextStyler new
attributesFor: (self convertToSHSymbol: aSymbol).
emphasized := attributes size > 1
ifTrue: [ attributes second emphasisCode ]
Expand Down
2 changes: 1 addition & 1 deletion src/NECompletion/NECSelectorEntry.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ NECSelectorEntry >> lookupSelector: aSymbol class: aClass [
NECSelectorEntry >> methodSourceDescription: aClass method: aCompiledMethod [
| styler styledText |

styler := SHTextStylerST80 new.
styler := SHRBTextStyler new.
styler classOrMetaClass: aClass.
styledText := styler styledTextFor: (aCompiledMethod sourceCode) asText.

Expand Down
2 changes: 1 addition & 1 deletion src/Polymorph-Widgets/PharoDarkTheme.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ PharoDarkTheme >> selectionTextColor [
{ #category : #defaults }
PharoDarkTheme >> shStyleTable [

^SHTextStylerST80 darkStyleTable
^SHRBTextStyler darkStyleTable
]

{ #category : #'accessing colors' }
Expand Down
2 changes: 1 addition & 1 deletion src/Polymorph-Widgets/PharoLightTheme.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ PharoLightTheme class >> setPreferredPreferences [
PharoLightTheme class >> setPreferredShoutColors [
"self setPreferredShoutColors"

SHTextStylerST80 styleTable:
SHRBTextStyler styleTable:
#(
"(symbol color [emphasisSymbolOrArray [textStyleName [pixelHeight]]])"
(default black)
Expand Down
2 changes: 1 addition & 1 deletion src/Polymorph-Widgets/UITheme.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5290,7 +5290,7 @@ UITheme >> settings: anObject [
{ #category : #accessing }
UITheme >> shStyleTable [

^SHTextStylerST80 blueStyleTable
^SHRBTextStyler blueStyleTable
]

{ #category : #'border-styles' }
Expand Down
10 changes: 4 additions & 6 deletions src/Shout/SHPreferences.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ Class {
SHPreferences class >> applyStyle [
| table |
table := Groups values flatCollect: [:group | group styleForTable].
SHTextStylerST80 styleTable: table.
SHRBTextStyler styleTable: table.
]

Expand Down Expand Up @@ -96,7 +95,7 @@ SHPreferences class >> globalVarStyle: aGroupStyle [

{ #category : #initialization }
SHPreferences class >> initialize [
self customStyleTable: SHTextStylerST80 defaultStyleTable
self customStyleTable: SHRBTextStyler defaultStyleTable
]

{ #category : #initialization }
Expand Down Expand Up @@ -170,16 +169,15 @@ SHPreferences class >> selectorPatternsStyle: aGroupStyle [

{ #category : #settings }
SHPreferences class >> setStyleTable: anArray [
SHTextStylerST80 styleTable: anArray.
SHRBTextStyler styleTable: anArray.
]

{ #category : #settings }
SHPreferences class >> setStyleTableNamed: aString [
self setStyleTable: (((Pragma allNamed: #styleTable: in: SHTextStylerST80 class)
self setStyleTable: (((Pragma allNamed: #styleTable: in: SHRBTextStyler class)
detect: [ :each | (each argumentAt: 1) = aString ])
method
valueWithReceiver: SHTextStylerST80 class
valueWithReceiver: SHRBTextStyler class
arguments: #())
]

Expand Down Expand Up @@ -239,7 +237,7 @@ SHPreferences class >> settingsOn: aBuilder [
SHPreferences class >> styleTableRow [
| allStyles |

allStyles := Pragma allNamed: #styleTable: in: SHTextStylerST80 class.
allStyles := Pragma allNamed: #styleTable: in: SHRBTextStyler class.
^Smalltalk ui theme
newRowIn: World
for: (
Expand Down
Loading