Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
Anastasia-Nikitina committed May 21, 2023
1 parent cf3635f commit 36d5c70
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/main/kotlin/solve/sidepanel/tabs/SidePanelTabsView.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/solve/styles/Style.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

0 comments on commit 36d5c70

Please sign in to comment.