MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 05:21:29 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-148392 Update New UI onboarding images for popup and toolwindow

Browse Source 
GitOrigin-RevId: 8f186f2893dfa1b5d5f6b53a698d19c629b1ae22
This commit is contained in:
Vera Petrenkova
2024-06-27 12:03:25 +02:00
committed by intellij-monorepo-bot
parent fb6b4f42d4
commit 7daec7cd45
2 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
platform/new-ui-onboarding/src/com/intellij/platform/ide/newUiOnboarding/NewUiOnboardingDialog.kt
View File

@@ -8,7 +8,6 @@ import com.intellij.openapi.options.ShowSettingsUtil
import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.DialogWrapper
import com.intellij.openapi.util.IconLoader
import com.intellij.openapi.wm.WindowManager
import com.intellij.ui.ClientProperty
import com.intellij.ui.JBColor
import com.intellij.ui.PopupBorder
@@ -17,15 +16,12 @@ import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.dsl.gridLayout.UnscaledGaps
import com.intellij.ui.dsl.gridLayout.UnscaledGapsY
import com.intellij.ui.scale.JBUIScale
import com.intellij.util.IconUtil
import com.intellij.util.ui.JBDimension
import com.intellij.util.ui.JBFont
import com.intellij.util.ui.JBUI
import com.intellij.util.ui.UIUtil
import java.awt.Color
import java.awt.Font
import javax.swing.JComponent
import javax.swing.JLabel
import javax.swing.JRootPane
import javax.swing.border.Border
import javax.swing.event.HyperlinkEvent
@@ -46,18 +42,11 @@ internal class NewUiOnboardingDialog(private val project: Project)
override fun createCenterPanel(): JComponent {
val contentGaps = UnscaledGaps(28, 32, 22, 32)
val imageWidth = 384
val imageHeight = 242
val imageSize = JBDimension(imageWidth, imageHeight)
val popupImage = IconLoader.getIcon(POPUP_IMAGE_PATH, NewUiOnboardingDialog::class.java.classLoader)
val panel = panel {
row {
val img = IconLoader.getIcon(POPUP_IMAGE_PATH, NewUiOnboardingDialog::class.java.classLoader)
val scale = JBUI.scale(imageHeight).toFloat() / img.iconHeight
cell(JLabel(IconUtil.scale(img, WindowManager.getInstance().getFrame(project), scale)))
icon(popupImage)
.customize(UnscaledGaps.EMPTY)
.applyToComponent {
preferredSize = imageSize
}
}
panel {
row {
@@ -68,7 +57,7 @@ internal class NewUiOnboardingDialog(private val project: Project)
}
}
row {
val maxWidth = imageWidth - JBUI.scale(contentGaps.width)
val maxWidth = popupImage.iconWidth - JBUI.scale(contentGaps.width)
val charWidth = window.getFontMetrics(JBFont.label()).charWidth('0')
val maxLineLength = maxWidth / charWidth
text(NewUiOnboardingBundle.message("dialog.text", ApplicationNamesInfo.getInstance().fullProductName), maxLineLength) { event ->

7
platform/platform-impl/src/com/intellij/ide/ui/experimental/meetNewUi/MeetNewUiToolWindow.kt
View File

@@ -19,6 +19,7 @@ import com.intellij.openapi.wm.WindowManager
import com.intellij.openapi.wm.ex.ToolWindowManagerEx
import com.intellij.openapi.wm.impl.ToolWindowManagerImpl
import com.intellij.ui.Gray
import com.intellij.ui.JBColor
import com.intellij.ui.components.JBScrollPane
import com.intellij.ui.dsl.builder.*
import com.intellij.ui.dsl.gridLayout.UnscaledGaps
@@ -46,8 +47,6 @@ internal class MeetNewUiToolWindow(private val project: Project, private val too
private val BANNER = IconLoader.getIcon("expui/meetNewUi/newUIOnboardingToolWindow.png", MeetNewUiToolWindow::class.java.classLoader)
private val BANNER_DARK_BACKGROUND = Gray.x01
private val BANNER_LIGHT_BACKGROUND = JBUI.CurrentTheme.ToolWindow.background()
private const val BANNER_HEIGHT = 231
}
@@ -60,9 +59,7 @@ internal class MeetNewUiToolWindow(private val project: Project, private val too
row {
val scale = JBUI.scale(BANNER_HEIGHT).toFloat() / BANNER.iconHeight
cell(object : JLabel(IconUtil.scale(BANNER, WindowManager.getInstance().getFrame(project), scale)) {
override fun getBackground(): Color {
return if (LafManager.getInstance().lookAndFeelReference.name == "Dark") BANNER_DARK_BACKGROUND else BANNER_LIGHT_BACKGROUND
}
override fun getBackground(): Color = JBColor(JBUI.CurrentTheme.ToolWindow.background(), Gray.x01)
})
.align(AlignX.FILL)
.applyToComponent {