Skip to content

Commit

Permalink
fix a typo and some formatting to make it more legible
Browse files Browse the repository at this point in the history
  • Loading branch information
estebanlm committed Jan 28, 2020
1 parent 180e49e commit 2246ec8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
9 changes: 5 additions & 4 deletions src/Calypso-Browser/ClyBrowserToolMorph.class.st
Expand Up @@ -426,7 +426,7 @@ ClyBrowserToolMorph >> isBuilt [
self flag: #TODO. "This patch is to ensure compatibility while working.
Ensure to remove later."
(containerTab respondsTo: #isRendered) ifTrue: [
^ containerTab isRenderer ].
^ containerTab isRendered ].
^ containerTab morph == self
]

Expand Down Expand Up @@ -585,10 +585,11 @@ ClyBrowserToolMorph >> waitBuildCompletion [

{ #category : #testing }
ClyBrowserToolMorph >> wantsStayInDifferentContext [

self isBuilt ifFalse: [ ^ false ].
self hasUnacceptedEdits ifTrue: [ ^true ].
self isTabSelected & self isExtraSelectionRequested ifTrue: [ ^true ].
self belongsToRemovedBrowserContext ifTrue: [ ^false ].
self hasUnacceptedEdits ifTrue: [ ^ true ].
self isTabSelected & self isExtraSelectionRequested ifTrue: [ ^ true ].
self belongsToRemovedBrowserContext ifTrue: [ ^ false ].

^ isManagedByUser
]
Expand Down
10 changes: 5 additions & 5 deletions src/Calypso-Browser/ClyNotebookManager.class.st
Expand Up @@ -59,21 +59,21 @@ ClyNotebookManager class >> of: aBrowser [

{ #category : #private }
ClyNotebookManager >> activationPriorityOf: aBrowserTool [

| priority |
aBrowserTool belongsToCurrentBrowserContext ifFalse: [
^aBrowserTool activationPriorityInNonActiveContext].

aBrowserTool belongsToCurrentBrowserContext
ifFalse: [ ^ aBrowserTool activationPriorityInNonActiveContext ].

priority := self overridenPriorityOf: aBrowserTool.
^(desiredSelection includes: aBrowserTool class)
^ (desiredSelection includes: aBrowserTool class)
ifTrue: [ priority * 1000 ]
ifFalse: [ priority ]
]

{ #category : #accessing }
ClyNotebookManager >> activeStatusBar [

^self selectedTools first statusBar
^ self selectedTools first statusBar
]

{ #category : #private }
Expand Down

0 comments on commit 2246ec8

Please sign in to comment.