Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New SplitLayout #570

Merged
merged 34 commits into from
Sep 6, 2024
Merged

New SplitLayout #570

merged 34 commits into from
Sep 6, 2024

Conversation

hamen
Copy link
Collaborator

@hamen hamen commented Aug 30, 2024 •
edited
Loading

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.

@hamen hamen requested a review from rock3r August 30, 2024 11:22
@hamen hamen self-assigned this Aug 30, 2024
@hamen hamen linked an issue Sep 3, 2024 that may be closed by this pull request
Rewrite split layouts #273
Closed
5 tasks
@hamen hamen marked this pull request as ready for review September 3, 2024 09:27
@rock3r rock3r added bug Something isn't working feature New feature or request labels Sep 3, 2024
@hamen hamen force-pushed the im-splitlayout branch 3 times, most recently from 79da995 to a55e52b Compare September 4, 2024 14:01
rock3r
rock3r reviewed Sep 4, 2024
View reviewed changes
...dalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/SplitLayouts.kt Outdated Show resolved Hide resolved
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 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
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 Outdated Show resolved Hide resolved
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 Outdated Show resolved Hide resolved
ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SplitLayout.kt Show resolved Hide resolved
hamen added a commit that referenced this pull request Sep 5, 2024
@hamen
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
@hamen
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
@hamen
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
@hamen
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
@hamen
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
@hamen
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
@hamen
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
@hamen
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
@hamen
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
@hamen
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
@hamen
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
@hamen
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
@hamen
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
@hamen
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
@hamen
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
@hamen
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
@hamen
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
@hamen
add missing KDOC to public API
750254c 
reference: #570 (comment)
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
fix NaN operation in calculateAdjustedSizes()
6895ca6 
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
iterate on SplitLayout draggable
4105822 
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
replace a whens with ifs
5968e5c 
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
iterate on draggable divider
00fa02b 
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
tune the pointer icon while dragging
0a3cc67 
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
make the linter happy
5f97264 
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
add min width to SplitLayout in IDE sample
7fd4595 
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
fix wrong params in SplitLayouts
619a4f4 
reference: #570 (comment)
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
name params consistently in SplitLayout
1f887de 
reference: #570 (comment)
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
add missing KDOC
7830f1d 
reference: #570 (comment)
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
add missing KDOC to public API
f2721e8 
reference: #570 (comment)
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
remove redundant value
a3ecc5c 
reference: #570 (comment)
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
inlined variable
44c3354 
reference: #570 (comment)
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
extract draggableState variable
ec3e4fd 
reference: #570 (comment)
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
rename maxPositionPx
c202a37 
reference: #570 (comment)
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
simplify pointer icon management
bf35081 
reference: #570 (comment)
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
rename fillModifier
43bcad8 
reference: #570 (comment)
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
remove redundant .then()
8e428a7 
reference: #570 (comment)
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
add -Px suffix to a couple of values
558e0f2 
reference: #570 (comment)
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
extract a couple of methods
f76cf49 
reference: #570 (comment)
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
moved values into doLayout()
f8ad7b1 
reference: #570 (comment)
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
iterate on windows resizing
25b8b78 
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@hamen
iterate once more on divider positioning while dragging
5a6ab7d 
Signed-off-by: Ivan Morgillo <imorgillo@gmail.com>
@rock3r rock3r enabled auto-merge (squash) September 6, 2024 12:29
@hamen hamen requested a review from rock3r September 6, 2024 12:30
rock3r
rock3r approved these changes Sep 6, 2024
View reviewed changes
Copy link
Collaborator

@rock3r rock3r left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and validated locally, great job!

@rock3r rock3r merged commit 5efee37 into main Sep 6, 2024
1 check passed
@rock3r rock3r deleted the im-splitlayout branch September 6, 2024 12:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rock3r rock3r rock3r approved these changes

Assignees

@hamen hamen

Labels
bug Something isn't working feature New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Rewrite split layouts
2 participants
@hamen @rock3r