MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

New toolbar: fix resizing on startup

Browse Source 
GitOrigin-RevId: d9011a4712672d838ab5ebf49d6eff5ba44c68f7
This commit is contained in:
elena.korotkova
2021-04-30 11:47:58 +00:00
committed by intellij-monorepo-bot
parent 685ea31584
commit aec141b5da
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/navigationToolbar/experimental/NewToolbarRootPaneExtension.kt
+22 -18
View File
@@ -90,28 +90,32 @@ class NewToolbarRootPaneExtension(val myProject: Project) : IdeRootPaneNorthExte
val toolbarSettingsService = ToolbarSettings.Companion.getInstance()
if (toolbarSettingsService is ExperimentalToolbarSettings) {
logger.info("ToolbarSettingsService is ExperimentalToolbarSettings")
logger.info("Show new toolbar: ${toolbarSettingsService.showNewToolbar}, presentation mode: ${instance.presentationMode}")
logger.info("Show old main toolbar: ${toolbarSettingsService.isToolbarVisible()}, old navbar visible: ${toolbarSettingsService.isNavBarVisible()}")
val visibleAndEnabled = toolbarSettingsService.showNewToolbar && !instance.presentationMode
if(visibleAndEnabled) {
logger.info("ToolbarSettingsService is ExperimentalToolbarSettings")
logger.info("Show new toolbar: ${toolbarSettingsService.showNewToolbar}, presentation mode: ${instance.presentationMode}")
logger.info(
"Show old main toolbar: ${toolbarSettingsService.isToolbarVisible()}, old navbar visible: ${toolbarSettingsService.isNavBarVisible()}")
myPanelWrapper.add(myPanel, BorderLayout.CENTER)
myPanel.add(myRightPanel, BorderLayout.EAST)//"growx, align trailing")
myPanel.add(myCenterPanel, BorderLayout.CENTER)//"growx, align leading")
myPanel.add(myLeftPanel, BorderLayout.WEST)//"growx, align leading")
myPanelWrapper.add(myPanel, BorderLayout.CENTER)
myPanel.add(myRightPanel, BorderLayout.EAST) //"growx, align trailing")
myPanel.add(myCenterPanel, BorderLayout.CENTER) //"growx, align leading")
myPanel.add(myLeftPanel, BorderLayout.WEST) //"growx, align leading")
val newToolbarActions = CustomActionsSchema.getInstance().getCorrectedAction("NewToolbarActions")
val newToolbarActions = CustomActionsSchema.getInstance().getCorrectedAction("NewToolbarActions")
val listChildren = (newToolbarActions as ActionGroup).getChildren(null)
addGroupComponent(myLeftPanel, "align leading", listChildren[0])
addGroupComponent(myCenterPanel, "align trailing, width 0:pref:max", listChildren[1])
addGroupComponent(myRightPanel, "align trailing, width pref!", listChildren[2])
val listChildren = (newToolbarActions as ActionGroup).getChildren(null)
addGroupComponent(myLeftPanel, "align leading", listChildren[0])
addGroupComponent(myCenterPanel, "align trailing, width 0:pref:max", listChildren[1])
addGroupComponent(myRightPanel, "align trailing, width pref!", listChildren[2])
myPanelWrapper.isVisible = toolbarSettingsService.showNewToolbar && !instance.presentationMode
myPanelWrapper.isEnabled = myPanelWrapper.isVisible
myPanel.isVisible = myPanelWrapper.isVisible
myLeftPanel.isVisible = myPanelWrapper.isVisible
myRightPanel.isVisible = myPanelWrapper.isVisible
logger.info("finish revalidate newtoolbar")
myPanelWrapper.isVisible = visibleAndEnabled
myPanelWrapper.isEnabled = visibleAndEnabled
myPanel.isVisible = visibleAndEnabled
myLeftPanel.isVisible = visibleAndEnabled
myRightPanel.isVisible = visibleAndEnabled
logger.info("finish revalidate newtoolbar")
}
}
else {
myPanel.isVisible = false