From 8878a668337e481784d006e1d724ffd8b96160fb Mon Sep 17 00:00:00 2001 From: Sergei Tachenov Date: Tue, 31 Jan 2023 08:28:50 +0200 Subject: [PATCH] [UI] IDEA-298485 Compact Mode: convert dimensions / insets to UIResources It has no practical effect at the moment, but it's more correct, as UI Defaults are expected to contain UIResources, so it may cause issues later if they aren't. GitOrigin-RevId: 2922d34fc19aa6b58b52b05f8643cce9929c0740 --- .../src/com/intellij/ide/ui/laf/LafManagerImpl.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.kt b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.kt index 4d99cfebe4b1..95c248bb245d 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.kt +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.kt @@ -674,14 +674,14 @@ class LafManagerImpl : LafManager(), PersistentStateComponent, Disposab } if (newDensity == UIDensity.COMPACT) { // main toolbar - defaults.put(JBUI.CurrentTheme.Toolbar.experimentalToolbarButtonSizeKey(), JBUI.size(34, 34)) + defaults.put(JBUI.CurrentTheme.Toolbar.experimentalToolbarButtonSizeKey(), JBUI.size(34, 34).asUIResource()) defaults.put(JBUI.CurrentTheme.Toolbar.experimentalToolbarButtonIconSizeKey(), 16) defaults.put(JBUI.CurrentTheme.Toolbar.experimentalToolbarFontKey(), Supplier { JBFont.medium() }) - defaults.put(JBUI.CurrentTheme.TitlePane.buttonPreferredSizeKey(), JBUI.size(44, 34)) + defaults.put(JBUI.CurrentTheme.TitlePane.buttonPreferredSizeKey(), JBUI.size(44, 34).asUIResource()) // tool window stripes - defaults.put(JBUI.CurrentTheme.Toolbar.stripeToolbarButtonSizeKey(), JBUI.size(32, 32)) + defaults.put(JBUI.CurrentTheme.Toolbar.stripeToolbarButtonSizeKey(), JBUI.size(32, 32).asUIResource()) defaults.put(JBUI.CurrentTheme.Toolbar.stripeToolbarButtonIconSizeKey(), 16) - defaults.put(JBUI.CurrentTheme.Toolbar.stripeToolbarButtonIconPaddingKey(), JBUI.insets(4)) + defaults.put(JBUI.CurrentTheme.Toolbar.stripeToolbarButtonIconPaddingKey(), JBUI.insets(4).asUIResource()) // Run Widget defaults.put(JBUI.CurrentTheme.RunWidget.toolbarHeightKey(), 26) defaults.put(JBUI.CurrentTheme.RunWidget.toolbarBorderHeightKey(), 4) @@ -691,11 +691,11 @@ class LafManagerImpl : LafManager(), PersistentStateComponent, Disposab // lists defaults.put("List.rowHeight", 24) // status bar - defaults.put(JBUI.CurrentTheme.StatusBar.Widget.insetsKey(), JBUI.insets(4, 8, 3, 8)) - defaults.put(JBUI.CurrentTheme.StatusBar.Breadcrumbs.navBarInsetsKey(), JBUI.insets(1, 0, 1, 4)) + defaults.put(JBUI.CurrentTheme.StatusBar.Widget.insetsKey(), JBUI.insets(4, 8, 3, 8).asUIResource()) + defaults.put(JBUI.CurrentTheme.StatusBar.Breadcrumbs.navBarInsetsKey(), JBUI.insets(1, 0, 1, 4).asUIResource()) defaults.put(JBUI.CurrentTheme.StatusBar.fontKey(), Supplier { JBFont.medium() }) // separate navbar - defaults.put(JBUI.CurrentTheme.NavBar.itemInsetsKey(), JBUI.insets(2)) + defaults.put(JBUI.CurrentTheme.NavBar.itemInsetsKey(), JBUI.insets(2).asUIResource()) // editor tabs defaults.put("EditorTabs.tabInsets", JBInsets(1, 12, 1, 8).asUIResource()) defaults.put(JBUI.CurrentTheme.EditorTabs.fontKey(), Supplier { JBFont.medium() })