Skip to content

Added scroll to Generation Arguments tab #45

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

Merged
ellizio merged 2 commits into from
Aug 21, 2025
Merged

Added scroll to Generation Arguments tab #45

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
417340c
Bump to 2025.2 (#44)
ellizio Aug 19, 2025
3fecc5a
Added scroll to Generation Arguments tab
ellizio Aug 21, 2025
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
3 changes: 1 addition & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ val DotnetSolution: String by project
val BuildConfiguration: String by project
val ProductVersion: String by project
val DotnetPluginId: String by project
val RiderPluginId: String by project
val PublishToken: String by project

allprojects {
Expand Down Expand Up @@ -73,7 +72,7 @@ tasks.compileJava {
}

tasks.compileKotlin {
compilerOptions { jvmTarget= JvmTarget.JVM_21 }
compilerOptions { jvmTarget = JvmTarget.JVM_21 }
}

intellijPlatform {
Expand Down
9 changes: 6 additions & 3 deletions src/rider/main/kotlin/ru/ellizio/odatacliui/dialogs/CliDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ import ru.ellizio.odatacliui.Constants
import ru.ellizio.odatacliui.UiBundle
import ru.ellizio.odatacliui.extensions.emptyText
import ru.ellizio.odatacliui.extensions.humanize
import ru.ellizio.odatacliui.extensions.scrollablePanel
import ru.ellizio.odatacliui.models.CliDialogModel
import ru.ellizio.odatacliui.models.validators.CliDialogValidators
import ru.ellizio.odatacliui.ui.ScrollableDialogPanel
import javax.swing.JComponent

class CliDialog(private val model: CliDialogModel) : BaseDialog(false) {
Expand All @@ -18,6 +20,7 @@ class CliDialog(private val model: CliDialogModel) : BaseDialog(false) {

init {
title = Constants.PLUGIN_NAME
isResizable = false
setOKActionEnabled(true)
init()
}
Expand Down Expand Up @@ -80,7 +83,7 @@ class CliDialog(private val model: CliDialogModel) : BaseDialog(false) {
}
}

private fun buildGenerationArgumentsTab(): DialogPanel = panel {
private fun buildGenerationArgumentsTab(): ScrollableDialogPanel = scrollablePanel {
row("--file-name") {
textField()
.align(AlignX.FILL)
Expand Down Expand Up @@ -154,8 +157,8 @@ class CliDialog(private val model: CliDialogModel) : BaseDialog(false) {
.bindSelected(model.upperCamelCase)
}
}.apply {
registerPanelValidators(this)
generationTabPanel = this
registerPanelValidators(this.panel)
generationTabPanel = this.panel
}

private fun buildRequestArgumentsTab(): DialogPanel = panel {
Expand Down
11 changes: 11 additions & 0 deletions src/rider/main/kotlin/ru/ellizio/odatacliui/extensions/UiExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,19 @@ package ru.ellizio.odatacliui.extensions

import com.intellij.ui.components.JBTextField
import com.intellij.ui.dsl.builder.Cell
import com.intellij.ui.dsl.builder.Panel
import com.intellij.ui.dsl.builder.panel
import ru.ellizio.odatacliui.ui.ScrollableDialogPanel

fun Cell<JBTextField>.emptyText(text: String): Cell<JBTextField> {
component.emptyText.text = text
return this
}

fun scrollablePanel(init: Panel.() -> Unit): ScrollableDialogPanel {
val content = panel(init)
return ScrollableDialogPanel(content).apply {
border = null
isOverlappingScrollBar = false
}
}
9 changes: 9 additions & 0 deletions src/rider/main/kotlin/ru/ellizio/odatacliui/ui/ScrollableDialogPanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package ru.ellizio.odatacliui.ui

import com.intellij.openapi.ui.DialogPanel
import com.intellij.ui.components.JBScrollPane

class ScrollableDialogPanel(private val view: DialogPanel) : JBScrollPane(view, VERTICAL_SCROLLBAR_AS_NEEDED, HORIZONTAL_SCROLLBAR_NEVER) {
val panel: DialogPanel
get() = view
}