From ba13fec4a2a0b7684a4f29c4ca79207a0bf7bf8a Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Fri, 2 Aug 2024 23:17:03 +0200 Subject: [PATCH] Fixed pointer not changing to hand in some components --- .../kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt | 4 ++-- src/main/kotlin/com/jetpackduba/gitnuro/ui/WelcomePage.kt | 4 +++- src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt index 741ed43..82caaa6 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt @@ -735,7 +735,7 @@ fun RevertingButtons( fun AbortButton(modifier: Modifier, onClick: () -> Unit) { Box( modifier = modifier - .clickable { onClick() } + .handMouseClickable { onClick() } .focusable(false) .clip(MaterialTheme.shapes.small) .background(MaterialTheme.colors.abortButton), @@ -765,7 +765,7 @@ fun ConfirmationButton( Box( modifier = modifier - .clickable { if (enabled) onClick() } + .handMouseClickable { if (enabled) onClick() } .focusable(false) // TODO this and the abort button should be focusable (show some kind of border when focused?) .clip(shape) .background(backgroundColor), diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/WelcomePage.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/WelcomePage.kt index ef63360..e149d43 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/WelcomePage.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/WelcomePage.kt @@ -540,7 +540,9 @@ fun IconTextButton( ) { TextButton( onClick = onClick, - modifier = modifier.size(width = 280.dp, height = 40.dp), + modifier = modifier + .size(width = 280.dp, height = 40.dp) + .handOnHover(), colors = textButtonColors(), ) { Row( diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt index 63ef445..31f009f 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt @@ -511,7 +511,7 @@ fun CommitsList( modifier = Modifier.height(MaterialTheme.linesHeight.logCommitHeight) .clipToBounds() .fillMaxWidth() - .clickable { onUncommittedChangesSelected() } + .handMouseClickable { onUncommittedChangesSelected() } ) { UncommittedChangesGraphNode( hasPreviousCommits = commitList.isNotEmpty(), @@ -848,7 +848,7 @@ private fun CommitLine( Box( modifier = Modifier .height(MaterialTheme.linesHeight.logCommitHeight) - .clickable { onRevCommitSelected() } + .handMouseClickable { onRevCommitSelected() } ) { val nodeColor = colors[graphNode.lane.position % colors.size]