From 0e042026fd88ced87b01d928a8fe4ca09d5592b7 Mon Sep 17 00:00:00 2001 From: aro Date: Fri, 6 Jan 2023 19:00:54 +0100 Subject: [PATCH] refactor: remove scale factor on move files button --- .../wrench/components/filemanager/FileManagerDisplay.kt | 3 ++- .../wrench/components/filemanager/bottom/MoveFilesButton.kt | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/FileManagerDisplay.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/FileManagerDisplay.kt index fb6ea79..4154345 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/FileManagerDisplay.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/FileManagerDisplay.kt @@ -13,6 +13,7 @@ import xyz.atnrch.wrench.components.filemanager.center.empty.DefaultDisplay import xyz.atnrch.wrench.components.filemanager.center.input.InputEntries import xyz.atnrch.wrench.components.filemanager.center.output.OutputEntries import xyz.atnrch.wrench.watcher.WatcherManager +import java.io.File import java.nio.file.Path @Composable @@ -51,7 +52,7 @@ fun DisplayEntries( onEntryClick: (id: Int) -> Unit ) { if (watcherManager.getEntries().isEmpty()) { - //watcherManager.addFile(File("/home/aro/IdeaProjects/Wrench/dummy")) + watcherManager.addFile(File("/home/aro/IdeaProjects/Wrench/dummy")) DefaultDisplay() } else { InputEntries(minmode, watcherManager, onEntryClick) diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/MoveFilesButton.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/MoveFilesButton.kt index ed5a135..4e4e722 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/MoveFilesButton.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/MoveFilesButton.kt @@ -13,7 +13,6 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Update import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.scale import androidx.compose.ui.draw.shadow import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp @@ -26,8 +25,6 @@ fun MoveFilesButton( state: WindowState, watcher: Watcher ) { - val scaleFactor: Float = if (state.size.width <= 600.dp) 0.85f else 1f - Button( onClick = { watcher.move() }, colors = ButtonDefaults.buttonColors(UIColors.DARK, Color.White), @@ -39,7 +36,7 @@ fun MoveFilesButton( ), shape = RoundedCornerShape(100), border = BorderStroke(2.dp, UIColors.GREEN), - modifier = Modifier.shadow(24.dp, RoundedCornerShape(100), false).scale(scaleFactor) + modifier = Modifier.shadow(24.dp, RoundedCornerShape(100), false) ) { Icon( Icons.Filled.Update,