From 36d5c70df76aca9026ccf9e35cfd137ade4cda11 Mon Sep 17 00:00:00 2001 From: Anastasia-Nikitina Date: Sun, 21 May 2023 03:10:08 +0300 Subject: [PATCH] rebase --- src/main/kotlin/solve/sidepanel/tabs/SidePanelTabsView.kt | 4 ++-- src/main/kotlin/solve/styles/Style.kt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/solve/sidepanel/tabs/SidePanelTabsView.kt b/src/main/kotlin/solve/sidepanel/tabs/SidePanelTabsView.kt index 6f031732..b6d8f822 100644 --- a/src/main/kotlin/solve/sidepanel/tabs/SidePanelTabsView.kt +++ b/src/main/kotlin/solve/sidepanel/tabs/SidePanelTabsView.kt @@ -8,6 +8,7 @@ import solve.sidepanel.SidePanelTab import solve.sidepanel.content.SidePanelContentController import solve.styles.SidePanelTabsStyle import solve.styles.Style +import solve.styles.Style.circleForRipple import tornadofx.* import java.net.URI @@ -45,13 +46,12 @@ open class SidePanelTabsView : View() { private fun addTab(tab: SidePanelTab) { val tabButton = togglebutton(tab.name, tabsToggleGroup) { setPrefSize(Style.NavigationRailTabSize, Style.NavigationRailTabSize) - clip = Style.circleForRipple(this) + clip = circleForRipple(this) styleClass.add(tab.name.lowercase()) contentDisplay = ContentDisplay.TOP style = "-fx-font-family: ${Style.Font}; -fx-font-weight:700;" + " -fx-font-size: ${Style.ButtonFontSize}; -fx-background-radius: 36" - isFocusTraversable = false tooltip(tab.tooltip) setPrefSize(72.0, 72.0) diff --git a/src/main/kotlin/solve/styles/Style.kt b/src/main/kotlin/solve/styles/Style.kt index 5398663d..2956e512 100644 --- a/src/main/kotlin/solve/styles/Style.kt +++ b/src/main/kotlin/solve/styles/Style.kt @@ -63,7 +63,8 @@ object Style { fun circleForRipple(button: ToggleButton) = Circle(button.layoutX + 36.0, button.layoutY + 36.0, 35.0) + const val ControlButtonsSpacing = 10.0 + const val HeaderFontSize = "20px" - const val ControlButtonsSpacing = 10.0 }