[etoys-dev] Etoys Inbox: EToysIMPORT-tfel.10.mcz
commits at source.squeak.org
commits at source.squeak.org
Thu Jul 28 11:09:40 EDT 2016
Tim Felgentreff uploaded a new version of EToysIMPORT to project Etoys Inbox:
http://source.squeak.org/etoysinbox/EToysIMPORT-tfel.10.mcz
==================== Summary ====================
Name: EToysIMPORT-tfel.10
Author: tfel
Time: 28 July 2016, 5:09:00.571263 pm
UUID: 25412ab9-1a18-6640-bd10-94ba1bc2cdd4
Ancestors: EToysIMPORT-tfel.9
updates from latest trunk
=============== Diff against EToysIMPORT-tfel.9 ===============
Item was changed:
----- Method: BorderedMorph>>useRoundedCornersInEtoys (in category '*EToysIMPORT-accessing') -----
useRoundedCornersInEtoys
+ SystemWindow roundedWindowCorners
- Preferences roundedWindowCorners
ifTrue: [self useRoundedCorners]!
Item was removed:
- ----- Method: Cursor class>>currentCursor: (in category '*EToysIMPORT-override-current cursor') -----
- currentCursor: aCursor
- "Make the instance of cursor, aCursor, be the current cursor. Display it.
- Create an error if the argument is not a Cursor."
-
- (aCursor isKindOf: self)
- ifTrue: [CurrentCursor _ aCursor.
- Preferences biggerCursors
- ifTrue: [[^aCursor asBigCursor beCursor]
- on: Error do: ["fall through"]].
- aCursor beCursor]
- ifFalse: [self error: 'The new cursor must be an instance of class Cursor']!
Item was removed:
- ----- Method: Cursor>>asBigCursor (in category '*EToysIMPORT-converting') -----
- asBigCursor
- "Big cursors are 32 bits deep (ARGB premultiplied)"
- depth = 32
- ifFalse: [^self enlargedBy: 2].
- ^self!
Item was removed:
- ----- Method: Cursor>>enlargedBy: (in category '*EToysIMPORT-converting') -----
- enlargedBy: scale
- "Big cursors are 32 bits deep (ARGB premultiplied)"
- | big |
- scale = 1 ifTrue: [^self].
- big := CursorWithAlpha extent: self extent * scale depth: 32.
- (self asCursorForm magnifyBy: scale) displayOn: big.
- big offset: (self offset - 0.5 * scale min: 0 at 0 max: big extent negated) asIntegerPoint.
- big fallback: self.
- ^big!
Item was removed:
- ----- Method: Cursor>>primBeCursor (in category '*EToysIMPORT-primitives') -----
- primBeCursor
- <primitive: 101>
- self primitiveFailed!
Item was removed:
- ----- Method: CursorWithMask>>primBeCursor (in category '*EToysIMPORT-primitives') -----
- primBeCursor
- maskForm unhibernate.
- ^ self beCursorWithMask: maskForm!
Item was changed:
----- Method: NewWorldWindow>>spawnReframeHandle: (in category '*EToysIMPORT-resize/collapse') -----
spawnReframeHandle: event
"The mouse has crossed a pane border. Spawn a reframe handle."
| resizer localPt pt ptName newBounds |
allowReframeHandles ifFalse: [^ self].
owner ifNil: [^ self "Spurious mouseLeave due to delete"].
(self isActive not or: [self isCollapsed]) ifTrue: [^ self].
((self world ifNil: [^ self]) firstSubmorph isKindOf: NewHandleMorph) ifTrue:
[^ self "Prevent multiple handles"].
"Transcript show: event hand printString,' ',event hand world printString,
' ',self world printString,' ',self outermostWorldMorph printString; cr; cr."
pt _ event cursorPoint.
self bounds forPoint: pt closestSideDistLen:
[:side :dist :len | "Check for window side adjust"
dist <= 2 ifTrue: [ptName _ side]].
ptName ifNil:
["Check for pane border adjust"
^ self spawnPaneFrameHandle: event].
#(topLeft bottomRight bottomLeft topRight) do:
[:corner | "Check for window corner adjust"
(pt dist: (self bounds perform: corner)) < 20 ifTrue: [ptName _ corner]].
resizer _ NewHandleMorph new
followHand: event hand
forEachPointDo:
[:p | localPt _ self pointFromWorld: p.
newBounds _ self bounds
withSideOrCorner: ptName
setToPoint: localPt
minExtent: self minimumExtent.
self fastFramingOn
ifTrue:
[self doFastWindowReframe: ptName]
ifFalse:
[self bounds: newBounds.
+ (SystemWindow roundedWindowCorners
- (Preferences roundedWindowCorners
and: [#(bottom right bottomRight) includes: ptName])
ifTrue:
["Complete kluge: causes rounded corners to get painted correctly,
in spite of not working with top-down displayWorld."
ptName = #bottom ifFalse:
[self invalidRect: (self bounds topRight - (6 at 0) extent: 7 at 7)].
ptName = #right ifFalse:
[self invalidRect: (self bounds bottomLeft - (0 at 6) extent: 7 at 7)].
self invalidRect: (self bounds bottomRight - (6 at 6) extent: 7 at 7)]]]
lastPointDo:
[:p | ].
self world addMorph: resizer.
resizer startStepping.
!
Item was removed:
- ----- Method: Preferences class>>biggerCursors (in category '*EToysIMPORT-standard queries') -----
- biggerCursors
- ^ self
- valueOfFlag: #biggerCursors
- ifAbsent: [true]!
Item was changed:
----- Method: Preferences class>>cambridge (in category '*EToysIMPORT-themes') -----
cambridge
"A theme for Squeakland and OLPC project"
"Preferences cambridge"
"This method has three parts. Don't forget to look at the stuff at the bottom."
self setPreferencesFrom: #(
(allowCelesteTell false)
(alternativeScrollbarLook true)
(alternativeWindowLook true)
(annotationPanes true)
(automaticKeyGeneration true)
(biggerHandles true)
(blinkParen false)
(browseWithDragNDrop true)
(canRecordWhilePlaying true)
(classicNavigatorEnabled false)
(compactViewerFlaps true)
(enableLocalSave false)
(escapeKeyProducesMenu false)
(eToyFriendly true)
(eToyLoginEnabled true)
(extraDebuggerButtons false)
(gradientMenu false)
(haloTransitions false)
(honorDesktopCmdKeys true)
(includeSoundControlInNavigator true)
(magicHalos false)
(menuAppearance3d false)
(menuKeyboardControl false)
(modalColorPickers true)
(mouseOverHalos false)
(mvcProjectsAllowed false)
(preserveTrash true)
(projectViewsInWindows false)
(promptForUpdateServer false)
(propertySheetFromHalo false)
(roundedMenuCorners false)
- (roundedWindowCorners false)
(securityChecksEnabled true)
(showDirectionHandles false)
(showDirectionForSketches true)
(showProjectNavigator false)
(showSecurityStatus false)
(soundQuickStart true) "see setPlatformPreferences"
(soundReverb false)
(soundStopWhenDone true) "see setPlatformPreferences"
(startInUntrustedDirectory true)
(sugarAutoSave false)
(swapControlAndAltKeys false) "see setPlatformPreferences"
(uniqueNamesInHalos true)
(unlimitedPaintArea false)
(useArtificialSweetenerBar true)
(useBiggerPaintingBox true)
(useFormsInPaintBox false)
(useLocale true)
(usePangoRenderer false)
(usePlatformFonts false)
(usePopUpArrows true)
(warnAboutInsecureContent false)
"The following is to make sure the default is set properly."
(abbreviatedBrowserButtons false)
(allowEtoyUserCustomEvents false)
(alphabeticalProjectMenu false)
(alternativeBrowseIt false)
(alternativeButtonsInScrollBars false)
(alternativeWindowBoxesLook true)
(alwaysHideHScrollbar false)
(alwaysShowConnectionVocabulary false)
(alwaysShowHScrollbar false)
(alwaysShowVScrollbar true)
(ansiAssignmentOperatorWhenPrettyPrinting true)
(areaFillsAreTolerant false)
(areaFillsAreVeryTolerant false)
(autoAccessors false)
(automaticFlapLayout true)
(automaticPlatformSettings true) "enables setPlatformPreferences"
(automaticViewerPlacement true)
(balloonHelpEnabled true)
(balloonHelpInMessageLists false)
(batchPenTrails false)
- (biggerCursors true)
(browserNagIfNoClassComment true)
(browserShowsPackagePane false)
(browseWithPrettyPrint false)
(capitalizedReferences true)
(caseSensitiveFinds false)
(cautionBeforeClosing false)
(celesteHasStatusPane false)
(celesteShowsAttachmentsFlag false)
(changeSetVersionNumbers true)
(checkForSlips true)
(checkForUnsavedProjects true)
(classicNewMorphMenu false)
(clickOnLabelToEdit false)
(cmdDotEnabled true)
(collapseWindowsInPlace false)
(colorWhenPrettyPrinting false)
(compressFlashImages false)
(confirmFirstUseOfStyle true)
(conversionMethodsAtFileOut false)
(cpuWatcherEnabled false)
(debugHaloHandle false)
(debugPrintSpaceLog false)
(debugShowDamage false)
(decorateBrowserButtons true)
(defaultFileOutFormatMacRoman false)
(diffsInChangeList true)
(diffsWithPrettyPrint false)
(dismissAllOnOptionClose false)
(dismissEventTheatreUponPublish true)
(dragNDropWithAnimation false)
(dropProducesWatcher true)
(duplicateControlAndAltKeys false)
(easySelection false)
(enableInternetConfig false)
(enablePortraitMode false)
(enableVirtualOLPCDisplay false)
(expandedPublishing true)
(extractFlashInHighestQuality false)
(extractFlashInHighQuality true)
(fastDragWindowForMorphic true)
(fenceEnabled true)
(fenceSoundEnabled false)
(fullScreenLeavesDeskMargins true)
(gradientScrollBars true)
(haloEnclosesFullBounds false)
(higherPerformance false)
(ignoreStyleIfOnlyBold true)
(implicitSelfInTiles false)
(inboardScrollbars true)
(infiniteUndo false)
(keepTickingWhilePainting false)
(logDebuggerStackToFile true)
(menuButtonInToolPane false)
(menuColorFromWorld false)
(menuWithIcons true)
(morphicProgressStyle true)
(mouseOverForKeyboardFocus false)
(navigatorOnLeftEdge true)
(noviceMode false)
(okToReinitializeFlaps true)
(oliveHandleForScriptedObjects false)
(optionalButtons true)
(passwordsOnPublish false)
(personalizedWorldMenu true)
(postscriptStoredAsEPS false)
(printAlternateSyntax false)
(projectsSentToDisk false)
(projectZoom true)
(readDocumentAtStartup true)
(restartAlsoProceeds false)
(reverseWindowStagger true)
(rotationAndScaleHandlesInPaintBox false)
(scrollBarsNarrow false)
(scrollBarsOnRight true)
(scrollBarsWithoutMenuButton false)
(selectionsMayShrink true)
(selectiveHalos true)
(showAdvancedNavigatorButtons false)
(showBoundsInHalo false)
(showDeprecationWarnings false)
(showFlapsWhenPublishing false)
(showLinesInHierarchyViews true)
(showSharedFlaps true)
(signProjectFiles true)
(simpleMenus false)
(slideDismissalsToTrash true)
(smartUpdating true)
(soundsEnabled true)
(sugarNavigator true)
(swapMouseButtons false)
(systemWindowEmbedOK false)
(tabAmongFields true)
(testRunnerShowAbstractClasses false)
(thoroughSenders true)
(tileTranslucentDrag true)
(timeStampsInMenuTitles true)
(translationWithBabel false)
(turnOffPowerManager false)
(twentyFourHourFileStamps true)
(twoSidedPoohTextures true)
(typeCheckingInTileScripting true)
(unifyNestedProgressBars true)
(uniTilesClassic true)
(universalTiles false)
(updateFromServerAtStartup false)
(updateSavesFile false)
(useButtonPropertiesToFire false)
(useFileList2 true)
(useSmartLabels false)
(useUndo true)
(useVectorVocabulary false)
(viewersInFlaps true)
(warnIfNoChangesFile false)
(warnIfNoSourcesFile false)
(warningForMacOSFileNameLength false)
(wordStyleCursorMovement true)
).
Preferences setPreference: #haloTheme toValue: #iconicHaloSpecifications.
!
Item was changed:
----- Method: SystemWindow>>spawnReframeHandle: (in category '*EToysIMPORT-resize/collapse') -----
spawnReframeHandle: event
"The mouse has crossed a pane border. Spawn a reframe handle."
| resizer localPt pt ptName newBounds cursor |
allowReframeHandles ifFalse: [^ self].
owner ifNil: [^ self "Spurious mouseLeave due to delete"].
(self isActive not or: [self isCollapsed]) ifTrue: [^ self].
((self world ifNil: [^ self]) firstSubmorph isKindOf: NewHandleMorph) ifTrue:
[^ self "Prevent multiple handles"].
pt _ event cursorPoint.
"prevent spurios mouse leave when dropping morphs"
owner morphsInFrontOf: self overlapping: (pt-2 extent: 4 at 4)
do:[:m| m isHandMorph ifFalse:[(m fullContainsPoint: pt) ifTrue:[^self]]].
self bounds forPoint: pt closestSideDistLen:
[:side :dist :len | "Check for window side adjust"
dist <= 2 ifTrue: [ptName _ side]].
ptName ifNil:
["Check for pane border adjust"
^ self spawnPaneFrameHandle: event].
#(topLeft bottomRight bottomLeft topRight) do:
[:corner | "Check for window corner adjust"
(pt dist: (self bounds perform: corner)) < 20 ifTrue: [ptName _ corner]].
cursor _ Cursor resizeForEdge: ptName.
resizer _ NewHandleMorph new
sensorMode: self fastFramingOn;
followHand: event hand
forEachPointDo:
[:p | localPt _ self pointFromWorld: p.
newBounds _ self bounds
withSideOrCorner: ptName
setToPoint: localPt
minExtent: self minimumExtent.
self fastFramingOn
ifTrue:
[Cursor currentCursor == cursor ifFalse:[
event hand visible: false; refreshWorld; visible: true.
cursor show].
self doFastWindowReframe: ptName]
ifFalse:
[self bounds: newBounds.
+ (SystemWindow roundedWindowCorners
- (Preferences roundedWindowCorners
and: [#(bottom right bottomRight) includes: ptName])
ifTrue:
["Complete kluge: causes rounded corners to get painted correctly,
in spite of not working with top-down displayWorld."
ptName = #bottom ifFalse:
[self invalidRect: (self bounds topRight - (6 at 0) extent: 7 at 7)].
ptName = #right ifFalse:
[self invalidRect: (self bounds bottomLeft - (0 at 6) extent: 7 at 7)].
self invalidRect: (self bounds bottomRight - (6 at 6) extent: 7 at 7)]]]
lastPointDo:
[:p | ]
withCursor: cursor.
event hand world addMorphInLayer: resizer.
resizer startStepping!
More information about the etoys-dev
mailing list