[squeak-dev] The Trunk: SMLoader-mt.97.mcz

commits at source.squeak.org commits at source.squeak.org
Wed Feb 9 13:44:52 UTC 2022


Marcel Taeumel uploaded a new version of SMLoader to project The Trunk:
http://source.squeak.org/trunk/SMLoader-mt.97.mcz

==================== Summary ====================

Name: SMLoader-mt.97
Author: mt
Time: 9 February 2022, 2:44:52.23178 pm
UUID: f56ba948-2b38-4d42-bf05-53c5ab915067
Ancestors: SMLoader-ct.96

Fixes layout regressions in SqueakMap tools.

=============== Diff against SMLoader-ct.96 ===============

Item was changed:
  ----- Method: SMLoader>>createWindow (in category 'interface') -----
  createWindow
  	| buttonBarHeight searchHeight vertDivide horizDivide |
  	buttonBarHeight := 0.07.
  	searchHeight := 0.07.
  	vertDivide := 0.3.
  	horizDivide := 0.6.
  	self addMorph: (self buildButtonBar borderWidth: 0)
  		frame: (0.0 @ 0.0 corner: 1.0 @ buttonBarHeight).
  	self addMorph: (self buildSearchPane borderWidth: 0)
  		frame: (0.0 @ buttonBarHeight corner: vertDivide @ searchHeight).
  	self addMorph: (self buildMorphicPackagesList borderWidth: 0)
  		frame: (0.0 @ (buttonBarHeight + searchHeight) corner: vertDivide @ horizDivide).
  	self addMorph: (self buildMorphicCategoriesList borderWidth: 0)
  		frame: (0.0 @ horizDivide corner: vertDivide @ 1.0).
  	self addMorph: (self buildPackagePane borderWidth: 0)
  		frame: (vertDivide @ buttonBarHeight corner: 1.0 @ 1.0).
  	self on: #mouseEnter send: #paneTransition: to: self.
+ 	self on: #mouseLeave send: #paneTransition: to: self.
+ 	self paneColor: self color.!
- 	self on: #mouseLeave send: #paneTransition: to: self!

Item was removed:
- ----- Method: SMLoader>>defaultButtonPaneHeight (in category 'interface') -----
- defaultButtonPaneHeight
- 	"Answer the user's preferred default height for new button panes."
- 
- 	^ Preferences parameterAt: #defaultButtonPaneHeight ifAbsentPut: [25]!

Item was changed:
  ----- Method: SMLoaderCategorical>>createWindow (in category 'interface') -----
  createWindow
  	| buttonBarHeight searchHeight vertDivide horizDivide |
  	buttonBarHeight := 0.07.
  	searchHeight := 0.07.
  	vertDivide := 0.5.
  	horizDivide := 0.6.
  	self addMorph: (self buildButtonBar borderWidth: 0)
  		frame: (0 @ 0 corner: 1 @ buttonBarHeight).
  	self addMorph: (self buildMorphicCategoriesList borderWidth: 0)
  		frame: (0 @ buttonBarHeight corner: vertDivide @ horizDivide).
  	self addMorph: (self buildSearchPane borderWidth: 0)
  		frame: (vertDivide @ buttonBarHeight corner: 1 @ (buttonBarHeight + searchHeight)).
  	self addMorph: (self buildMorphicPackagesList borderWidth: 0)
  		frame: (vertDivide @ (buttonBarHeight + searchHeight) corner: 1 @ horizDivide).
  	self addMorph: (self buildPackagePane borderWidth: 0)
  		frame: (0 @ horizDivide corner: 1 @ 1).
  	self on: #mouseEnter send: #paneTransition: to: self.
  	self on: #mouseLeave send: #paneTransition: to: self.
+ 	self setLabel: self defaultLabel.
+ 	self paneColor: self color.!
- 	self setLabel: self defaultLabel!

Item was added:
+ ----- Method: SMLoaderCategoricalPlus>>buildBrowsePanelWith: (in category 'interface') -----
+ buildBrowsePanelWith: aBuilder
+ 
+ 	| panel searchPaneHeight |
+ 	searchPaneHeight := aBuilder inputFieldHeight.
+ 	panel := aBuilder pluggablePanelSpec new.
+ 	panel children: OrderedCollection new.
+ 	panel children
+ 		add: ((self buildSearchPaneWith: aBuilder)
+ 			frame: (LayoutFrame
+ 				fractions: (0 @ 0 corner: 1 @ 0)
+ 				offsets: (0 @ 0 corner: 0@ searchPaneHeight)));
+ 		add: ((self buildPackagesListWith: aBuilder)
+ 			frame: (LayoutFrame
+ 				fractions: (0 @ 0 corner: 1 @ 1)
+ 				offsets: (0 @ searchPaneHeight corner: 0 at 0))).
+ 	^ panel!

Item was changed:
  ----- Method: SMLoaderCategoricalPlus>>buildWith: (in category 'interface') -----
  buildWith: aBuilder
+ 	| buttonBarHeight vertDivide horizDivide |
+ 	buttonBarHeight := aBuilder buttonRowHeight.
- 	| buttonBarHeight searchHeight vertDivide horizDivide |
- 	buttonBarHeight := Preferences standardButtonFont height * 2.
- 	searchHeight := Preferences standardDefaultTextFont height * 2.
  	vertDivide := 0.5.
  	horizDivide := 0.6.
  	builder := aBuilder.
  	window := builder build: (builder pluggableWindowSpec new model: self;
  				label: #label;
  				children:  (OrderedCollection new
  						add: ((self buildButtonBarWith: builder)
  							frame: (LayoutFrame
  								fractions: (0 @ 0 corner: 1 @ 0)
  								offsets: (0 at 0 corner: 0 at buttonBarHeight)));
  						add: ((self buildCategoriesListWith: builder)
  							frame: (LayoutFrame
  								fractions: (0 @ 0 corner: vertDivide @ horizDivide)
  								offsets: (0@ buttonBarHeight corner: 0 at 0)));
+ 						add: ((self buildBrowsePanelWith: builder)
- 						add: ((self buildSearchPaneWith: builder)
  							frame: (LayoutFrame
- 								fractions: (vertDivide @ 0 corner: 1 @ 0)
- 								offsets: (0@ buttonBarHeight corner: 0@ (buttonBarHeight + searchHeight))));
- 						add: ((self buildPackagesListWith: builder)
- 							frame: (LayoutFrame
  								fractions: (vertDivide @ 0 corner: 1 @ horizDivide)
+ 								offsets: (0 @ buttonBarHeight corner: 0 at 0)));
- 								offsets: (0 @ (buttonBarHeight + searchHeight) corner: 0 at 0)));
  						add: ((self buildPackagePaneWith: builder)
  								frame: (0 @ horizDivide corner: 1 @ 1));
  						 yourself);
  					 yourself).
  	window on: #mouseEnter send: #paneTransition: to: window.
  	window on: #mouseLeave send: #paneTransition: to: window.
- 	window extent: self initialExtent.
  	^ window!

Item was added:
+ ----- Method: SMLoaderPlus>>buildBrowsePanelWith: (in category 'interface') -----
+ buildBrowsePanelWith: aBuilder
+ 
+ 	| panel vertDivide searchPaneHeight |
+ 	vertDivide := 0.6.
+ 	searchPaneHeight := aBuilder inputFieldHeight.
+ 	panel := aBuilder pluggablePanelSpec new.
+ 	panel wantsResizeHandles: true.
+ 	panel children: OrderedCollection new.
+ 	panel children
+ 		add: ((self buildSearchPaneWith: aBuilder)
+ 			frame: (LayoutFrame
+ 				fractions: (0 @ 0 corner: 1 @ 0)
+ 				offsets: (0 @ 0 corner: 0@ searchPaneHeight)));
+ 		add: ((self buildPackagesListWith: aBuilder)
+ 			frame: (LayoutFrame
+ 				fractions: (0 @ 0 corner: 1 @ vertDivide)
+ 				offsets: (0 @ searchPaneHeight corner: 0 at 0)));
+ 		add: ((self buildCategoriesListWith: aBuilder)
+ 			frame: (0 @ vertDivide corner: 1 @ 1)).
+ 	^ panel!

Item was changed:
  ----- Method: SMLoaderPlus>>buildWith: (in category 'interface') -----
  buildWith: aBuilder 
  	"Create the package loader window."
+ 	| buttonBarHeight searchPaneHeight horizDivide |
+ 	buttonBarHeight := aBuilder buttonRowHeight.
+ 	searchPaneHeight := aBuilder inputFieldHeight.
+ 	
- 	| buttonBarHeight searchPaneHeight vertDivide horizDivide |
- 	buttonBarHeight := Preferences standardButtonFont height * 2.
- 	searchPaneHeight := Preferences standardDefaultTextFont height * 2.
- 	vertDivide := 0.6.
  	horizDivide := 0.3.
  	builder := aBuilder.
  	window := builder build: (builder pluggableWindowSpec new model: self;
  					 label: #label;
  					 children: (OrderedCollection new
  						add: ((self buildButtonBarWith: builder)
  							frame: (LayoutFrame
  								fractions: (0 @ 0 corner: 1 @ 0)
  								offsets: (0 at 0 corner: 0 at buttonBarHeight)));
+ 						add: ((self buildBrowsePanelWith: builder)
- 						add: ((self buildSearchPaneWith: builder)
  							frame: (LayoutFrame
+ 								fractions: (0 @ 0 corner: horizDivide @ 1)
+ 								offsets: (0 at buttonBarHeight corner: 0 at 0 )));
- 								fractions: (0 @ 0 corner: horizDivide @ 0)
- 								offsets: (0@ buttonBarHeight corner: 0@ (buttonBarHeight + searchPaneHeight))));
- 						add: ((self buildPackagesListWith: builder)
- 							frame: (LayoutFrame
- 								fractions: (0 @ 0 corner: horizDivide @ vertDivide)
- 								offsets: (0 @ (buttonBarHeight + searchPaneHeight) corner: 0 at 0)));
- 						add: ((self buildCategoriesListWith: builder)
- 							frame: (0 @ vertDivide corner: horizDivide @ 1));
  						add: ((self buildPackagePaneWith: builder)
  								frame: (LayoutFrame
  									fractions: (horizDivide @ 0 corner: 1 @ 1)
  									offsets: (0 @ buttonBarHeight corner: 0 at 0)));
  						 yourself);
  					 yourself).
  	window on: #mouseEnter send: #paneTransition: to: window.
  	window on: #mouseLeave send: #paneTransition: to: window.
- 	window extent: self initialExtent.
  	^ window!

Item was removed:
- ----- Method: SMLoaderPlus>>defaultButtonPaneHeight (in category 'interface') -----
- defaultButtonPaneHeight
- 	"Answer the user's preferred default height for new button panes."
- 
- 	^ Preferences parameterAt: #defaultButtonPaneHeight ifAbsentPut: [25]!

Item was removed:
- ----- Method: SMLoaderPlus>>initialExtent (in category 'interface') -----
- initialExtent
- 	^500 at 400!



More information about the Squeak-dev mailing list