X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fplat%2FAWT.java;h=27d213b11b09643aa16edaa90f38f4e0519f9999;hp=f3f53d2517457e365ca7289a8ef1be8c2ab0a016;hb=cab49a265d0483f7162711a12193a966c2dd3521;hpb=05d23fde131a7d19b378c632c6cc6b7924d8ab4d diff --git a/src/org/ibex/plat/AWT.java b/src/org/ibex/plat/AWT.java index f3f53d2..27d213b 100644 --- a/src/org/ibex/plat/AWT.java +++ b/src/org/ibex/plat/AWT.java @@ -302,7 +302,7 @@ public class AWT extends JVM { public void setIcon(Picture i) { if (frame != null) frame.setIconImage(((AWTPicture)i).i); } public void _setSize(int width, int height) { g = null; - //window.setSize(width + (insets.left + insets.right), height + (insets.top + insets.bottom)); + window.setSize(width + (insets.left + insets.right), height + (insets.top + insets.bottom)); } public void setInvisible(boolean b) { window.setVisible(!b); } protected void _setMinimized(boolean b) { if (Log.on) Log.info(this, "JDK 1.1 platforms cannot minimize or unminimize windows"); } @@ -318,7 +318,7 @@ public class AWT extends JVM { class InnerFrame extends Frame { public InnerFrame() throws java.lang.UnsupportedOperationException { } - public Dimension getMinimumSize() { return new Dimension(root.minwidth(), root.minheight()); } + public Dimension getMinimumSize() { return new Dimension(root.minwidth, root.minheight); } public void update(Graphics gr) { Rectangle r = gr.getClipBounds(); super.update(gr); @@ -347,7 +347,7 @@ public class AWT extends JVM { class InnerWindow extends Window { public InnerWindow() throws java.lang.UnsupportedOperationException { super(new Frame()); } - public Dimension getMinimumSize() { return new Dimension(root.minwidth(), root.minheight()); } + public Dimension getMinimumSize() { return new Dimension(root.minwidth, root.minheight); } public void update(Graphics gr) { paint(gr); } public void paint(Graphics gr) { g = null; @@ -370,6 +370,12 @@ public class AWT extends JVM { super.render(); } + Insets getInsets() { + Insets ret = window.getInsets(); + if (System.getProperty("os.name", "").equals("Mac OS X")) ret.bottom = -1 * ret.top; + return ret; + } + AWTSurface(Box root, boolean framed) { super(root); try { @@ -382,7 +388,7 @@ public class AWT extends JVM { if (Log.on) Log.info(this, e); } - insets = window.getInsets(); + insets = getInsets(); window.addMouseListener(this); window.addKeyListener(this); @@ -448,14 +454,14 @@ public class AWT extends JVM { public void componentResized(ComponentEvent e) { // we have to periodically do this; I don't know why - insets = window.getInsets(); + insets = getInsets(); componentResized(window.getWidth() - insets.left - insets.right, window.getHeight() - insets.top - insets.bottom); } public void componentResized(int newwidth, int newheight) { SizeChange(newwidth, newheight); - //if (newwidth > root.width) Dirty(root.width, 0, newwidth-root.width, newheight); - //if (newheight > root.height) Dirty(0, root.height, newwidth, newheight-root.height); + if (newwidth > root.width) Dirty(root.width, 0, newwidth-root.width, newheight); + if (newheight > root.height) Dirty(0, root.height, newwidth, newheight-root.height); Refresh(); }