geekinney/ebox
1
0
Fork 0
Code Issues Pull Requests Actions 21 Packages Projects Releases Wiki Activity

Make minmax grid tracks responsive

Browse Source
This commit is contained in:
Kinneyzhang 2026-08-22 10:19:12 +08:00
parent 1edc6d5bb6
commit 33c625ad82
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ebox-grid.el
View File

@ -368,6 +368,17 @@ Supported properties are `:grid-column', `:grid-row',
('minmax (ebox-grid--track-max (plist-get track :max))) ('minmax (ebox-grid--track-max (plist-get track :max)))
(_ nil))) (_ nil)))
(defun ebox-grid--track-flex-factor (track)
"Return TRACK's flexible maximum factor, or zero when it is fixed.
`minmax' tracks commonly use a zero minimum with a fractional maximum for
responsive layouts. Treat that maximum as a real flexible track instead of
letting the grid fall back to each child's intrinsic width."
(pcase (plist-get track :kind)
('fr (plist-get track :factor))
('minmax (ebox-grid--track-flex-factor (plist-get track :max)))
(_ 0)))
(defun ebox-grid--clamp-track-size (track size) (defun ebox-grid--clamp-track-size (track size)
"Clamp SIZE to TRACK's fixed maximum when one exists." "Clamp SIZE to TRACK's fixed maximum when one exists."
(if-let ((maximum (ebox-grid--track-max track))) (if-let ((maximum (ebox-grid--track-max track)))
@ -391,21 +402,18 @@ Supported properties are `:grid-column', `:grid-row',
track axis entries rendered track axis entries rendered
(if (eq axis 'columns) :column :row) (if (eq axis 'columns) :column :row)
index)))) index))))
(fr-total (apply #'+ (fr-total (apply #'+ (mapcar #'ebox-grid--track-flex-factor tracks)))
(mapcar (lambda (track)
(if (eq (plist-get track :kind) 'fr)
(plist-get track :factor) 0))
tracks)))
(used (+ (ebox-grid--sum sizes) (* gap (max 0 (1- count)))))) (used (+ (ebox-grid--sum sizes) (* gap (max 0 (1- count))))))
(when (and available (> fr-total 0)) (when (and available (> fr-total 0))
(let ((remaining (max 0 (- available used)))) (let ((remaining (max 0 (- available used))))
(cl-loop for track in tracks (cl-loop for track in tracks
for index from 0 for index from 0
when (eq (plist-get track :kind) 'fr) for factor = (ebox-grid--track-flex-factor track)
when (> factor 0)
do (setf (nth index sizes) do (setf (nth index sizes)
(floor (* remaining (max (nth index sizes)
(/ (float (plist-get track :factor)) (floor (* remaining
fr-total))))))) (/ (float factor) fr-total))))))))
sizes)) sizes))
(defun ebox-grid--distribute (amount count) (defun ebox-grid--distribute (amount count)

13
tests/ebox-grid-tests.el
View File

@ -37,6 +37,19 @@
(should (= (length lines) 1)) (should (= (length lines) 1))
(should (= (ebox--string-pixel-width (car lines)) 120)))) (should (= (ebox--string-pixel-width (car lines)) 120))))
(ert-deftest ebox-grid-minmax-fractional-columns-fill-and-shrink ()
"Zero-minimum fractional maxima should remain responsive to width."
(dolist (width '(120 60))
(let* ((node (ebox-grid
:width (list width)
:grid-template-columns
'((minmax (0) (fr 1)) (minmax (0) (fr 2)))
(ebox-create :content "A" :width 'stretch)
(ebox-create :content "B" :width 'stretch)))
(lines (ebox-string-lines (ebox-render node))))
(should (= (ebox--string-max-pixel-width
(car lines)) width)))))
(ert-deftest ebox-grid-stretch-children-fill-fractional-tracks () (ert-deftest ebox-grid-stretch-children-fill-fractional-tracks ()
"Stretch-width children must reflow to their assigned fractional tracks." "Stretch-width children must reflow to their assigned fractional tracks."
(let* ((left (ebox-create :content "left" :width 'stretch)) (let* ((left (ebox-create :content "left" :width 'stretch))