Skip to content

Commit

Permalink
8292669: IGV: Search not useable when in Overflow Toolbar
Browse files Browse the repository at this point in the history 
Co-authored-by: Christian Hagedorn <chagedorn@openjdk.org>
Co-authored-by: Tobias Holenstein <tholenstein@openjdk.org>
Reviewed-by: chagedorn, rcastanedalo
  • Loading branch information
@tobiasholenstein @chhagedorn
tobiasholenstein and chhagedorn committed Aug 26, 2022
1 parent 4732abf commit 2b80349
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 51 deletions.
16 changes: 7 additions & 9 deletions ...alizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,13 @@
import com.sun.hotspot.igv.util.LookupHistory;
import com.sun.hotspot.igv.view.EditorTopComponent;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.Serializable;
import javax.swing.*;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.border.Border;
import org.openide.ErrorManager;
import org.openide.actions.GarbageCollectAction;
Expand All @@ -46,12 +48,7 @@
import org.openide.explorer.ExplorerManager;
import org.openide.explorer.ExplorerUtils;
import org.openide.explorer.view.BeanTreeView;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.LookupEvent;
import org.openide.util.LookupListener;
import org.openide.util.NbBundle;
import org.openide.util.Utilities;
import org.openide.util.*;
import org.openide.util.actions.NodeAction;
import org.openide.windows.TopComponent;
import org.openide.windows.WindowManager;
Expand Down Expand Up @@ -97,8 +94,9 @@ private void initListView() {

private void initToolbar() {
Toolbar toolbar = new Toolbar();
Border b = (Border) UIManager.get("Nb.Editor.Toolbar.border"); //NOI18N
toolbar.setBorder(b);
toolbar.setBorder((Border) UIManager.get("Nb.Editor.Toolbar.border")); //NOI18N
toolbar.setMinimumSize(new Dimension(0,0)); // MacOS BUG with ToolbarWithOverflow

this.add(toolbar, BorderLayout.NORTH);

toolbar.add(ImportAction.get(ImportAction.class));
Expand Down
11 changes: 8 additions & 3 deletions ...lizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,17 @@
import com.sun.hotspot.igv.filter.FilterSetting;
import com.sun.hotspot.igv.filterwindow.actions.*;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.*;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.script.*;
import javax.script.ScriptContext;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import javax.swing.JComboBox;
import javax.swing.UIManager;
import javax.swing.border.Border;
Expand Down Expand Up @@ -360,8 +364,9 @@ private FilterTopComponent() {

ToolbarPool.getDefault().setPreferredIconSize(16);
Toolbar toolBar = new Toolbar();
Border b = (Border) UIManager.get("Nb.Editor.Toolbar.border"); //NOI18N
toolBar.setBorder(b);
toolBar.setBorder((Border) UIManager.get("Nb.Editor.Toolbar.border")); //NOI18N
toolBar.setMinimumSize(new Dimension(0,0)); // MacOS BUG with ToolbarWithOverflow

comboBox = new JComboBox();
toolBar.add(comboBox);
this.add(toolBar, BorderLayout.NORTH);
Expand Down
80 changes: 41 additions & 39 deletions .../IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,30 @@
*/
package com.sun.hotspot.igv.view;

import com.sun.hotspot.igv.data.ChangedEvent;
import com.sun.hotspot.igv.data.ChangedListener;
import com.sun.hotspot.igv.data.GraphDocument;
import com.sun.hotspot.igv.data.Group;
import com.sun.hotspot.igv.data.InputNode;
import com.sun.hotspot.igv.data.InputBlock;
import com.lowagie.text.Document;
import com.lowagie.text.Rectangle;
import com.lowagie.text.pdf.PdfContentByte;
import com.lowagie.text.pdf.PdfGraphics2D;
import com.lowagie.text.pdf.PdfTemplate;
import com.lowagie.text.pdf.PdfWriter;
import com.sun.hotspot.igv.data.Properties;
import com.sun.hotspot.igv.data.*;
import com.sun.hotspot.igv.data.Properties.PropertyMatcher;
import com.sun.hotspot.igv.data.services.InputGraphProvider;
import com.sun.hotspot.igv.filter.FilterChain;
import com.sun.hotspot.igv.filter.FilterChainProvider;
import com.sun.hotspot.igv.graph.Diagram;
import com.sun.hotspot.igv.graph.Figure;
import com.sun.hotspot.igv.graph.services.DiagramProvider;
import com.sun.hotspot.igv.settings.Settings;
import com.sun.hotspot.igv.util.LookupHistory;
import com.sun.hotspot.igv.util.RangeSlider;
import com.sun.hotspot.igv.settings.Settings;
import com.sun.hotspot.igv.view.actions.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.HierarchyBoundsListener;
import java.awt.event.HierarchyEvent;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.*;
Expand All @@ -58,13 +58,6 @@
import org.apache.batik.dom.GenericDOMImplementation;
import org.apache.batik.svggen.SVGGeneratorContext;
import org.apache.batik.svggen.SVGGraphics2D;
import com.lowagie.text.Document;
import com.lowagie.text.Rectangle;
import com.lowagie.text.pdf.PdfWriter;
import com.lowagie.text.pdf.PdfContentByte;
import com.lowagie.text.pdf.PdfTemplate;
import com.lowagie.text.pdf.PdfGraphics2D;
import org.w3c.dom.DOMImplementation;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.actions.RedoAction;
Expand All @@ -79,11 +72,9 @@
import org.openide.util.lookup.AbstractLookup;
import org.openide.util.lookup.InstanceContent;
import org.openide.util.lookup.ProxyLookup;
import org.openide.windows.Mode;
import org.openide.windows.TopComponent;
import org.openide.windows.WindowManager;
import org.w3c.dom.DOMImplementation;

import static java.nio.charset.StandardCharsets.UTF_8;

/**
*
Expand All @@ -92,7 +83,6 @@
public final class EditorTopComponent extends TopComponent implements PropertyChangeListener {

private DiagramViewer scene;
private Toolbar toolBar;
private InstanceContent content;
private InstanceContent graphContent;
private EnableSeaLayoutAction seaLayoutAction;
Expand All @@ -110,16 +100,9 @@ public final class EditorTopComponent extends TopComponent implements PropertyCh
private RangeSlider rangeSlider;
private JToggleButton overviewButton;
private JToggleButton hideDuplicatesButton;

private static final Component quicksearch;
static {
Action searchAction = Utilities.actionsForPath("Actions/Search").get(0);
quicksearch = ((Presenter.Toolbar) searchAction).getToolbarPresenter();
Dimension preferredSize = quicksearch.getPreferredSize();
preferredSize = new Dimension((int) preferredSize.getWidth() * 2, (int) preferredSize.getHeight());
quicksearch.setMinimumSize(preferredSize); // necessary for GTK LAF
quicksearch.setPreferredSize(preferredSize);
}
private JPanel topPanel;
private Toolbar quickSearchToolbar;
private static final JPanel quickSearchPresenter = (JPanel) ((Presenter.Toolbar) Utilities.actionsForPath("Actions/Search").get(0)).getToolbarPresenter();
private static final String PREFERRED_ID = "EditorTopComponent";
private static final String SATELLITE_STRING = "satellite";
private static final String SCENE_STRING = "scene";
Expand Down Expand Up @@ -208,9 +191,10 @@ public EditorTopComponent(Diagram diagram) {
initComponents();

ToolbarPool.getDefault().setPreferredIconSize(16);
toolBar = new Toolbar();
Border b = (Border) UIManager.get("Nb.Editor.Toolbar.border"); //NOI18N
toolBar.setBorder(b);
Toolbar toolBar = new Toolbar();
toolBar.setBorder((Border) UIManager.get("Nb.Editor.Toolbar.border")); //NOI18N
toolBar.setMinimumSize(new Dimension(0,0)); // MacOS BUG with ToolbarWithOverflow

JPanel container = new JPanel();
this.add(container, BorderLayout.NORTH);
container.setLayout(new BorderLayout());
Expand Down Expand Up @@ -324,9 +308,24 @@ public void changed(DiagramViewModel source) {
button.setSelected(false);
toolBar.add(button);
selectionModeAction.addPropertyChangeListener(this);

toolBar.add(Box.createHorizontalGlue());
toolBar.add(quicksearch);

quickSearchToolbar = new Toolbar();
quickSearchToolbar.setLayout(new BoxLayout(quickSearchToolbar, BoxLayout.LINE_AXIS));
quickSearchToolbar.setBorder((Border) UIManager.get("Nb.Editor.Toolbar.border")); //NOI18N
quickSearchPresenter.setMinimumSize(quickSearchPresenter.getPreferredSize());
quickSearchPresenter.setAlignmentX(Component.RIGHT_ALIGNMENT);
quickSearchToolbar.add(quickSearchPresenter);

// Needed for toolBar to use maximal available width
JPanel toolbarPanel = new JPanel(new GridLayout(1, 0));
toolbarPanel.add(toolBar);

topPanel = new JPanel();
topPanel.setLayout(new BoxLayout(topPanel, BoxLayout.LINE_AXIS));
topPanel.add(toolbarPanel);
topPanel.add(quickSearchToolbar);
container.add(BorderLayout.NORTH, topPanel);

centerPanel = new JPanel();
centerPanel.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
Expand Down Expand Up @@ -457,12 +456,9 @@ public int getPersistenceType() {
return TopComponent.PERSISTENCE_NEVER;
}

@Override
public void componentOpened() {
}

@Override
public void componentClosed() {
super.componentClosed();
rangeSliderModel.close();
}

Expand Down Expand Up @@ -658,7 +654,6 @@ protected void componentHidden() {

@Override
protected void componentShowing() {
toolBar.add(quicksearch);
super.componentShowing();
scene.componentShowing();
}
Expand All @@ -669,6 +664,13 @@ public void requestActive() {
scene.getComponent().requestFocus();
}

@Override
protected void componentActivated() {
super.componentActivated();
quickSearchToolbar.add(quickSearchPresenter);
quickSearchPresenter.revalidate();
}

@Override
public UndoRedo getUndoRedo() {
return scene.getUndoRedo();
Expand Down

1 comment on commit 2b80349

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

Please sign in to comment.