getting to work on the new gui, plus much-improved text drawing

This commit is contained in:
Ben Fry
2015-01-25 09:40:09 -05:00
parent 22f58671aa
commit 342c6958ab
9 changed files with 82 additions and 90 deletions

View File

@@ -91,7 +91,6 @@ public class DebugTray extends JFrame {
scrollPane = new JScrollPane();
tree = new Outline();
scrollPane.setViewportView(tree);
GroupLayout layout = new GroupLayout(getContentPane());
@@ -99,11 +98,16 @@ public class DebugTray extends JFrame {
layout.setHorizontalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
.addGap(0, 400, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
.addComponent(scrollPane, GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)));
.addComponent(scrollPane,
GroupLayout.DEFAULT_SIZE,
400, Short.MAX_VALUE)));
layout.setVerticalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
.addGap(0, 300, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
.addComponent(scrollPane, GroupLayout.Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)));
.addComponent(scrollPane,
GroupLayout.Alignment.TRAILING,
GroupLayout.DEFAULT_SIZE,
300, Short.MAX_VALUE)));
pack();
// setup Outline
@@ -138,6 +142,11 @@ public class DebugTray extends JFrame {
}
class TrayToolbar extends JComponent {
}
/** Keeps the debug window adjacent the editor at all times. */
class EditorFollower implements ComponentListener {

View File

@@ -922,6 +922,7 @@ public class Debugger implements VMEventListener {
return "";
}
return t.frame(0).thisObject().referenceType().name();
} catch (IncompatibleThreadStateException ex) {
log(Level.SEVERE, null, ex);
return "";