New SplitLayout #570

hamen · 2024-08-30T11:22:51Z

This PR introduces the new SplitLayout. The implementation takes inspiration from the existing one and from the Accompanist TwoPane one.

Main points

Colors match Swing
The divider is draggable
The divider is 1.dp wide, with an invisible wider area around it to facilitate click & dragging
The divider position can be remembered in upper components or in a ViewModel
The divider cannot be focused
It allows nested layouts
It allows minimum widths. When the available width is less than the desired panes minimum width, it shrinks the panes, keeping the expected ratio. This mirrors the Swing behavior.

ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SplitLayout.kt

...dalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/SplitLayouts.kt

ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SplitLayout.kt

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

rock3r

Tested and validated locally, great job!

* replace SplitLayout Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * add splitlayout icon Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * add SplitLayout icon to the collection Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * create the SplitLayouts showcase in the Standalone Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * make it uglier but now the linter is happy Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * hoist the SplitLayout divider state Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * remove nested layout from SplitLayouts showcase Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * add responsive minimum width to SplitLayout Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * make the linter happy Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * iterate on SplitLayout icon Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * fix NaN operation in calculateAdjustedSizes() Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * iterate on SplitLayout draggable Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * replace a whens with ifs Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * iterate on draggable divider Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * tune the pointer icon while dragging Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * make the linter happy Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * add min width to SplitLayout in IDE sample Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * fix wrong params in SplitLayouts reference: JetBrains/jewel#570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * name params consistently in SplitLayout reference: JetBrains/jewel#570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * add missing KDOC reference: JetBrains/jewel#570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * add missing KDOC to public API reference: JetBrains/jewel#570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * remove redundant value reference: JetBrains/jewel#570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * inlined variable reference: JetBrains/jewel#570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * extract draggableState variable reference: JetBrains/jewel#570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * rename maxPositionPx reference: JetBrains/jewel#570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * simplify pointer icon management reference: JetBrains/jewel#570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * rename fillModifier reference: JetBrains/jewel#570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * remove redundant .then() reference: JetBrains/jewel#570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * add -Px suffix to a couple of values reference: JetBrains/jewel#570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * extract a couple of methods reference: JetBrains/jewel#570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * moved values into doLayout() reference: JetBrains/jewel#570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * iterate on windows resizing Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * iterate once more on divider positioning while dragging Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> * Fix formatting --------- Signed-off-by: Ivan Morgillo <imorgillo@gmail.com> Co-authored-by: Sebastiano Poggi <sebp@google.com> GitOrigin-RevId: 16948878239582d44c95e96fc0c719258495b44f

hamen requested a review from rock3r August 30, 2024 11:22

hamen self-assigned this Aug 30, 2024

hamen linked an issue Sep 3, 2024 that may be closed by this pull request

Rewrite split layouts #273

Closed

5 tasks

hamen marked this pull request as ready for review September 3, 2024 09:27

rock3r added bug Something isn't working feature New feature or request labels Sep 3, 2024

hamen force-pushed the im-splitlayout branch from f4714ff to 9c03b25 Compare September 3, 2024 15:40

rock3r reviewed Sep 4, 2024

View reviewed changes

ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SplitLayout.kt Outdated Show resolved Hide resolved

ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SplitLayout.kt Show resolved Hide resolved

ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SplitLayout.kt Show resolved Hide resolved

hamen force-pushed the im-splitlayout branch 3 times, most recently from 79da995 to a55e52b Compare September 4, 2024 14:01

rock3r reviewed Sep 4, 2024

View reviewed changes

hamen added a commit that referenced this pull request Sep 5, 2024

fix wrong params in SplitLayouts

0ac05a5

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

name params consistently in SplitLayout

49a355d

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

add missing KDOC

098fa50

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

add missing KDOC to public API

3da6d68

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

remove redundant value

0f01853

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

inlined variable

20494ec

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

extract draggableState variable

164fd33

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

rename maxPositionPx

69d4ea3

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

simplify pointer icon management

7223a97

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

rename fillModifier

a026c34

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

remove redundant .then()

6734094

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

add -Px suffix to a couple of values

4643584

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

extract a couple of methods

08c4b28

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

moved values into doLayout()

60559bf

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

fix wrong params in SplitLayouts

b410892

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

name params consistently in SplitLayout

3a50926

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

add missing KDOC

06e793a

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added a commit that referenced this pull request Sep 5, 2024

add missing KDOC to public API

750254c

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen added 22 commits September 6, 2024 11:30

iterate on SplitLayout draggable

4105822

Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

replace a whens with ifs

5968e5c

Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

iterate on draggable divider

00fa02b

Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

tune the pointer icon while dragging

0a3cc67

Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

make the linter happy

5f97264

Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

add min width to SplitLayout in IDE sample

7fd4595

Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

fix wrong params in SplitLayouts

619a4f4

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

name params consistently in SplitLayout

1f887de

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

add missing KDOC

7830f1d

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

add missing KDOC to public API

f2721e8

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

remove redundant value

a3ecc5c

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

inlined variable

44c3354

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

extract draggableState variable

ec3e4fd

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

rename maxPositionPx

c202a37

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

simplify pointer icon management

bf35081

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

rename fillModifier

43bcad8

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

remove redundant .then()

8e428a7

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

add -Px suffix to a couple of values

558e0f2

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

extract a couple of methods

f76cf49

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

moved values into doLayout()

f8ad7b1

reference: #570 (comment) Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

iterate on windows resizing

25b8b78

Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

iterate once more on divider positioning while dragging

5a6ab7d

Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>

hamen force-pushed the im-splitlayout branch from c306ae0 to 5a6ab7d Compare September 6, 2024 09:30

Fix formatting

14a9e87

rock3r enabled auto-merge (squash) September 6, 2024 12:29

hamen requested a review from rock3r September 6, 2024 12:30

rock3r approved these changes Sep 6, 2024

View reviewed changes

rock3r merged commit 5efee37 into main Sep 6, 2024
1 check passed

rock3r deleted the im-splitlayout branch September 6, 2024 12:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New SplitLayout #570

New SplitLayout #570

hamen commented Aug 30, 2024 •

edited

Loading

rock3r left a comment

New SplitLayout #570

New SplitLayout #570

Conversation

hamen commented Aug 30, 2024 • edited Loading

Main points

rock3r left a comment

Choose a reason for hiding this comment

hamen commented Aug 30, 2024 •

edited

Loading