toolbar height takes into account display mode

pharo-spec · Dec 31, 2018 · 8686964 · 8686964
1 parent 576b7ca
commit 8686964
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 29 deletions.
diff --git a/src/Spec-Core/ToolBarPresenter.class.st b/src/Spec-Core/ToolBarPresenter.class.st
@@ -83,7 +83,7 @@ ToolBarPresenter >> isDisplayModeBoth [
 { #category : #testing }
 ToolBarPresenter >> isDisplayModeIcons [
 
-	^ self displayMode = ToolBarDisplayMode modeIcon.
+	^ self displayMode = ToolBarDisplayMode modeIcon
 ]
 
 { #category : #testing }

diff --git a/src/Spec-MorphicAdapters/MorphicToolBarAdapter.class.st b/src/Spec-MorphicAdapters/MorphicToolBarAdapter.class.st
@@ -11,6 +11,8 @@ Class {
 MorphicToolBarAdapter >> addModelTo: toolBarMorph [
 
 	toolBarMorph displayMode: self model displayMode. 
+	toolBarMorph height: self model displayMode height.
+
 	self model items 
 		at: ToolBarItemPosition left 
 		ifPresent: [ :items |
@@ -19,6 +21,7 @@ MorphicToolBarAdapter >> addModelTo: toolBarMorph [
 					configureItem: each 
 					morph: each buildWithSpec 
 					toolBar: toolBarMorph) ] ].
+
 	self model items 
 		at: ToolBarItemPosition right 
 		ifPresent: [ :items |

diff --git a/src/Spec-PolyWidgets/ToolBarDisplayMode.class.st b/src/Spec-PolyWidgets/ToolBarDisplayMode.class.st
@@ -55,5 +55,12 @@ ToolBarDisplayMode >> extent [
 
 { #category : #accessing }
 ToolBarDisplayMode >> height [
+
 	^ self extent y
 ]
+
+{ #category : #accessing }
+ToolBarDisplayMode >> width [
+
+	^ self extent x
+]
diff --git a/src/Spec-PolyWidgets/ToolBarDisplayModeIcon.class.st b/src/Spec-PolyWidgets/ToolBarDisplayModeIcon.class.st
@@ -16,5 +16,6 @@ ToolBarDisplayModeIcon >> configureButton: aButton item: aToolbarItem [
 
 { #category : #accessing }
 ToolBarDisplayModeIcon >> extent [
-	^ 25@25
+
+	^ 30@30
 ]
diff --git a/src/Spec-PolyWidgets/ToolBarMorph.class.st b/src/Spec-PolyWidgets/ToolBarMorph.class.st
@@ -17,21 +17,25 @@ Class {
 
 { #category : #accessing }
 ToolBarMorph class >> defaultHeight [
+
 	^ self defaultMode height
 ]
 
 { #category : #accessing }
 ToolBarMorph class >> defaultItemSeparation [
+
 	^ 0
 ]
 
 { #category : #accessing }
 ToolBarMorph class >> defaultItemSize [
+
 	^ 50
 ]
 
 { #category : #accessing }
 ToolBarMorph class >> defaultMode [
+
 	^ ToolBarDisplayMode default
 ]
 
@@ -72,11 +76,13 @@ ToolBarMorph >> addItemRight: aMorph [
 
 { #category : #'as yet unclassified' }
 ToolBarMorph >> addItemsFromContext: aContext [
-	| menu |
+
+	self flag: #TODO.
+	"| menu |
 	
 	menu := CmdMenu activatedBy: ITToolbarActivation.
 	menu buildInContext: aContext.
-	menu buildToolbarOn: self
+	menu buildToolbarOn: self"
 
 ]
 
@@ -159,33 +165,10 @@ ToolBarMorph >> newToolbarItemFont [
 		pointSize: buttonFont pointSize - 3
 ]
 
-{ #category : #accessing }
-ToolBarMorph >> rebuildLeftPanel [
-
-	self halt.
-	"self leftPanel removeAllMorphs.
-	leftItems do: [ :each | 
-		leftPanel addMorphBack: ((each buildMorphOnToolbar: self)
-			vResizing: #spaceFill;
-			yourself) ]"
-]
-
-{ #category : #accessing }
-ToolBarMorph >> rebuildRightPanel [
-
-	self halt.
-	"self rightPanel removeAllMorphs.
-	rightItems do: [ :each | 
-		rightPanel addMorphBack: ((each buildMorphOnToolbar: self)
-			vResizing: #spaceFill;
-			yourself) ]"
-]
-
 { #category : #accessing }
 ToolBarMorph >> refresh [
 
-	self rebuildLeftPanel.
-	self rebuildRightPanel.
+	self flag: #TODO. "Maybe remove?"
 ]
 
 { #category : #'private accessing' }
@@ -210,5 +193,6 @@ ToolBarMorph >> toolbarItemFont: anObject [
 
 { #category : #accessing }
 ToolBarMorph >> toolbarItemSize [
-	^ self class defaultItemSize
+
+	^ self displayMode height
 ]
-Original file line number
+Diff line change
@@ Expand Up @@
     { #category : #accessing }
     ToolBarDisplayModeIcon >> extent [
-    	^ 25@25
+    	^ 30@30
     ]