@@ -267,14 +267,14 @@ private JComponent createHeaderComponent(FileEditor fileEditor, Editor editor, V
267267 settingsActions .add (new GraphQLEditConfigAction ());
268268 settingsActions .add (new JSGraphQLToggleVariablesAction ());
269269
270- final JComponent settingsToolbar = createToolbar (settingsActions );
270+ final JComponent settingsToolbar = createToolbar (settingsActions , headerComponent );
271271 headerComponent .add (settingsToolbar , BorderLayout .WEST );
272272
273273 // query execute
274274 final DefaultActionGroup queryActions = new DefaultActionGroup ();
275275 final AnAction executeGraphQLAction = ActionManager .getInstance ().getAction (JSGraphQLExecuteEditorAction .class .getName ());
276276 queryActions .add (executeGraphQLAction );
277- final JComponent queryToolbar = createToolbar (queryActions );
277+ final JComponent queryToolbar = createToolbar (queryActions , headerComponent );
278278
279279 // configured endpoints combo box
280280 final List <GraphQLConfigEndpoint > endpoints = GraphQLConfigManager .getService (myProject ).getEndpoints (file );
@@ -331,9 +331,10 @@ private JComponent createHeaderComponent(FileEditor fileEditor, Editor editor, V
331331 return headerComponent ;
332332 }
333333
334- private JComponent createToolbar (ActionGroup actionGroup ) {
334+ private JComponent createToolbar (ActionGroup actionGroup , JComponent parent ) {
335335 final ActionToolbar toolbar = ActionManager .getInstance ().createActionToolbar (ActionPlaces .EDITOR_TOOLBAR , actionGroup , true );
336336 toolbar .setReservePlaceAutoPopupIcon (false ); // don't want space after the last button
337+ toolbar .setTargetComponent (parent );
337338 final JComponent component = toolbar .getComponent ();
338339 component .setBorder (BorderFactory .createEmptyBorder ());
339340 return component ;
0 commit comments