backends: further cleanup of text-bounding-rectangle* api

2 files changed, 3 insertions, 26 deletions

diff --git a/Extensions/fonts/mcclim-native-ttf.lisp b/Extensions/fonts/mcclim-native-ttf.lisp
index aa438497..d5fd9b09 100644
--- a/Extensions/fonts/mcclim-native-ttf.lisp
+++ b/Extensions/fonts/mcclim-native-ttf.lisp
@@ -360,30 +360,8 @@ but argument must constitute exactly one character."
              (incf origin-x (font-glyph-dx font code))
              (incf origin-y (font-glyph-dy font code))))
       (map-over-string-glyph-codes #'process-code string start end)
-      (ecase align-x
-        (:left)
-        (:center
-         (let ((hcenter (/ (- xmax xmin) 2)))
-           (setf xmin (- hcenter))
-           (setf xmax (+ hcenter))))
-        (:right
-         (let ((hsize (- xmax xmin)))
-           (setf xmin (- hsize))
-           (setf xmax 0))))
-      (ecase align-y
-        (:top
-         (let ((vsize (- ymax ymin)))
-           (setf ymin 0)
-           (setf ymax vsize)))
-        (:center
-         (let ((vcenter (/ (- ymax ymin) 2)))
-           (setf ymin (- vcenter))
-           (setf ymax (+ vcenter))))
-        (:baseline)
-        (:bottom
-         (let ((vsize (- ymax ymin)))
-           (setf ymin (- vsize))
-           (setf ymax 0))))
+      (multiple-value-setq (xmin ymin xmax ymax)
+        (climb:align-bounding-rectangle xmin ymin xmax ymax align-x align-y))
       (values xmin ymin xmax ymax origin-x origin-y))))
 
 (defun font-text-extents (font string &key start end align-x align-y direction)
diff --git a/Extensions/render/package.lisp b/Extensions/render/package.lisp
index da1f0e8b..32276918 100644
--- a/Extensions/render/package.lisp
+++ b/Extensions/render/package.lisp
@@ -49,5 +49,4 @@
                 #:medium-native-transformation
                 #:medium-device-transformation
                 #:medium-native-region
-                #:medium-device-region
-                #:multiline-text-medium-mixin))
+                #:medium-device-region))