                  :rect (generic-outer-rect state shape)
                  :text (generic-outer-rect state shape)
                  :icon (generic-outer-rect state shape)
+                 :icon-raw (generic-outer-rect state shape)
                  ;; :path (generic-outer-rect state shape)
                  :path (path-outer-rect state shape)
                  :circle (circle-outer-rect state shape)

  (case (:type shape)
    :rect (setup-rect shape props)
    :icon (setup-rect shape props)
    :text (setup-rect shape props)
    :circle (setup-circle shape props)
    :group (setup-group shape props)))


(declare setup-proportions-rect)

;; FIXME: improve proportions setup for icons.

(defn setup-proportions
  [shape]
  (case (:type shape)
    :rect (setup-proportions-rect shape)
    :icon (setup-proportions-rect shape)
    :icon-raw (setup-proportions-rect shape)
    :circle (setup-proportions-rect shape)
    shape))

