The Trunk: Morphic-mt.1072.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: Morphic-mt.1072.mcz

commits-2
Marcel Taeumel uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-mt.1072.mcz

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

Name: Morphic-mt.1072
Author: mt
Time: 5 February 2016, 3:10:01.550028 pm
UUID: 18ca1973-578d-4d91-828c-9fe4e0210215
Ancestors: Morphic-tpr.1071

Limit max initial extent of fill-in-the-blank morphs.

=============== Diff against Morphic-tpr.1071 ===============

Item was changed:
  ----- Method: FillInTheBlankMorph>>setQuery:initialAnswer:answerExtent:acceptOnCR: (in category 'initialization') -----
  setQuery: queryString initialAnswer: initialAnswer answerExtent: answerExtent acceptOnCR: acceptBoolean
  | query topOffset accept cancel buttonAreaHeight |
  response := initialAnswer.
  done := false.
  self removeAllMorphs.
  self layoutPolicy: ProportionalLayout new.
  query := self createQueryTextMorph: queryString.
  topOffset := query height + 4.
  accept := self createAcceptButton.
  cancel := self createCancelButton.
  buttonAreaHeight := (accept height max: cancel height)
  + 7.
  textPane := self
  createTextPaneExtent: answerExtent
  acceptBoolean: acceptBoolean
  topOffset: topOffset
  buttonAreaHeight: buttonAreaHeight.
 
+ self extent: (((answerExtent max: query extent)
+ max: (initialAnswer asText asMorph extent)) min: 500@500) + (20@30) +  (0 @ (topOffset + buttonAreaHeight))!
- self extent: ((answerExtent max: query extent)
- max: (initialAnswer asText asMorph extent)) + (20@30) +  (0 @ (topOffset + buttonAreaHeight))!