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

Refactor/2.2.0 #34

Merged
merged 2 commits into from
Nov 8, 2024
Merged

Refactor/2.2.0 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9888bc1
refactor: some log levels
cmhulbert Nov 8, 2024
2bbc8a3
refactor: ResizeOnLeftSide to DragActionSet
cmhulbert Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/kotlin/org/janelia/saalfeldlab/fx/actions/Action.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ open class Action<E : Event>(val eventType: EventType<E>) {
if (consume) {
event?.consume()
}
logger.debug { "completed successfully" }
logger.trace { "completed successfully" }
true
} else {
if (!isConsumed) {
Expand Down
56 changes: 30 additions & 26 deletions src/main/kotlin/org/janelia/saalfeldlab/fx/ui/ResizeOnLeftSide.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,11 @@ package org.janelia.saalfeldlab.fx.ui

import javafx.beans.property.DoubleProperty
import javafx.beans.property.SimpleBooleanProperty
import javafx.event.EventHandler
import javafx.scene.Cursor
import javafx.scene.Node
import javafx.scene.input.MouseEvent
import org.janelia.saalfeldlab.fx.actions.ActionSet.Companion.installActionSet
import org.janelia.saalfeldlab.fx.actions.ActionSet.Companion.removeActionSet
import javafx.scene.input.MouseEvent.MOUSE_MOVED
import org.janelia.saalfeldlab.fx.actions.DragActionSet
import org.janelia.saalfeldlab.fx.extensions.nonnullVal
import org.janelia.saalfeldlab.fx.extensions.nonnull
import java.util.function.DoublePredicate
import kotlin.math.abs
import kotlin.math.max
Expand All @@ -50,18 +47,13 @@ class ResizeOnLeftSide @JvmOverloads constructor(
private val minWidth: Double = 50.0,
private val maxWidth: Double = 500.0,
private val isWithinMarginOfBorder: DoublePredicate = DoublePredicate { abs(it) < 5 }
) {
) : DragActionSet("resize-on-left") {

private val isCurrentlyWithinMarginOfBorderProperty = SimpleBooleanProperty(false)
val isCurrentlyWithinMarginOfBorder: Boolean by isCurrentlyWithinMarginOfBorderProperty.nonnullVal()
internal var isCurrentlyWithinMarginOfBorder: Boolean by isCurrentlyWithinMarginOfBorderProperty.nonnull()
private set

private val mouseMoved = EventHandler<MouseEvent> {
val bounds = node.boundsInParent
val y = it.y
isCurrentlyWithinMarginOfBorderProperty.set(y >= bounds.minY && y <= bounds.maxY && isWithinMarginOfBorder.test(it.x - bounds.minX))
}

private val mouseDragged = DragActionSet("resize") {
init {
verify { isCurrentlyWithinMarginOfBorder }

relative = false
Expand All @@ -70,33 +62,45 @@ class ResizeOnLeftSide @JvmOverloads constructor(
dragAction.filter = true
dragReleaseAction.filter = true


onDragDetected { node.scene.cursor = Cursor.W_RESIZE }
onDrag {
val bounds = node.localToScene(node.boundsInLocal)
val dx = it.sceneX - bounds.minX
this@ResizeOnLeftSide.width.set(min(max(width.get() - dx, this@ResizeOnLeftSide.minWidth), this@ResizeOnLeftSide.maxWidth))
width.set(min(max(width.get() - dx, minWidth), maxWidth))
}
onDragReleased { node.scene.cursor = Cursor.DEFAULT }
}

init {
val withinMarginOfBorderAction = MOUSE_MOVED {
filter = true
consume = false
onAction { event ->
event ?: return@onAction

isCurrentlyWithinMarginOfBorderProperty.addListener { _, _, newv ->
if (!mouseDragged.isDragging) {
node.scene?.run { cursor = if (newv) Cursor.W_RESIZE else Cursor.DEFAULT }
val bounds = node.boundsInParent
val inHeightBounds = event.y >= bounds.minY && event.y <= bounds.maxY
val nearBorder = isWithinMarginOfBorder.test(event.x - bounds.minX)
isCurrentlyWithinMarginOfBorder = inHeightBounds && nearBorder
}
}

isCurrentlyWithinMarginOfBorderProperty.subscribe { withinMarginOfBorder ->
if (!withinMarginOfBorderAction.isValid(null)) {
node.scene?.run { cursor = Cursor.DEFAULT }
return@subscribe
}
if (isDragging) return@subscribe

node.scene?.run { cursor = if (withinMarginOfBorder) Cursor.W_RESIZE else Cursor.DEFAULT }
}
}

fun install() {
node.parent.addEventFilter(MouseEvent.MOUSE_MOVED, mouseMoved)
node.parent.installActionSet(mouseDragged)
node.parent.installActionSet(this)
}

fun remove() {
node.parent.removeEventFilter(MouseEvent.MOUSE_MOVED, mouseMoved)
node.parent.removeActionSet(mouseDragged)
this.isCurrentlyWithinMarginOfBorderProperty.set(false)
node.parent.removeActionSet(this)
isCurrentlyWithinMarginOfBorder = false
}

}
Loading