FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GtkFramePeer.java (getMenuBarHeight): Added MenuBarPeer parameter.

Browse source 
2004-01-19  Kim Ho  <kho@redhat.com>

        * gnu/java/awt/peer/gtk/GtkFramePeer.java (getMenuBarHeight): Added
        MenuBarPeer parameter.
        (removeMenuBarPeer): New native method.
        (setMenuBar): Call remove if menu bar is null. Adjust insets
        appropriately.
        (postSizeAllocateEvent): New method. Called when menu bar size is
        allocated. Adjust insets and redo layout.
        (GtkFramePeer): Set menu bar during frame creation.
        (postConfigureEvent): Adjust position and size to accomodate
        menu bar.
        * java/awt/Frame.java (setMenuBar): addNotify to create menu bar.
        * java/awt/Menu.java (addSeparator): Use peer's addSeparator.
        (addNotify): Create the peer if it doesn't exist and call addNotify
        for the menu's items.
        * java/awt/MenuBar.java (addNotify): Create this menu bar's menus.
        * java/awt/MenuItem.java (addNotify): Create the peer if it
        doesn't exist.
        * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
        (removeMenuBarPeer): New method. Remove menu bar on the current
        frame.
        (setMenuBarPeer): Add the menu bar to the current frame and the
        callback for size-allocate events on the menu bar.
        (getMenuBarHeight): Add menu bar parameter.
        (menubar_resize_cb): New callback method for postSizeAllocate events.

        Also: Fix indentation on last ChangeLog entry.

From-SVN: r76149
This commit is contained in:
Kim Ho 2004-01-19 14:27:45 +00:00 • committed by Kim Ho
parent 9543baba84
commit 2c20a17152
7 changed files with 178 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

68
libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java
View file

@ -1,5 +1,5 @@
/* GtkFramePeer.java -- Implements FramePeer with GTK
Copyright (C) 1999, 2002 Free Software Foundation, Inc.
Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -45,6 +45,7 @@ import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.MenuBar;
import java.awt.Rectangle;
import java.awt.Window;
import java.awt.event.PaintEvent;
import java.awt.peer.FramePeer;
import java.awt.peer.MenuBarPeer;
@ -53,16 +54,41 @@ public class GtkFramePeer extends GtkWindowPeer
implements FramePeer
{
int menuBarHeight = 0;
native int getMenuBarHeight ();
private MenuBarPeer menuBar;
native int getMenuBarHeight (MenuBarPeer bar);
native public void setMenuBarPeer (MenuBarPeer bar);
native public void removeMenuBarPeer (MenuBarPeer bar);
public void setMenuBar (MenuBar bar)
{
if (bar == null)
setMenuBarPeer (null);
else
setMenuBarPeer ((MenuBarPeer) bar.getPeer ());
if (bar == null && menuBar != null)
{
removeMenuBarPeer(menuBar);
menuBar = null;
insets.top -= menuBarHeight;
menuBarHeight = 0;
awtComponent.doLayout();
}
else if (bar != null)
{
if (menuBar != null)
removeMenuBarPeer(menuBar);
menuBar = (MenuBarPeer) ((MenuBar) bar).getPeer();
setMenuBarPeer(menuBar);
}
}
protected void postSizeAllocateEvent()
{
if (menuBar != null)
{
if (menuBarHeight != 0)
insets.top -= menuBarHeight;
menuBarHeight = getMenuBarHeight(menuBar);
insets.top += menuBarHeight;
}
awtComponent.doLayout();
}
public GtkFramePeer (Frame frame)
@ -74,6 +100,7 @@ public class GtkFramePeer extends GtkWindowPeer
{
// Create a normal decorated window.
create (GDK_WINDOW_TYPE_HINT_NORMAL, true);
setMenuBar(((Frame) awtComponent).getMenuBar());
}
public void getArgs (Component component, GtkArgList args)
@ -102,10 +129,31 @@ public class GtkFramePeer extends GtkWindowPeer
g.translate (-insets.left, -insets.top);
return g;
}
// FIXME: When MenuBars work, override postConfigureEvent and
// setBounds to account for MenuBar dimensions.
protected void postConfigureEvent (int x, int y, int width, int height)
{
int frame_x = x - insets.left;
// Add the height of the menubar (if none, menuBarHeight is 0 and has no
// effect). To move the frame down a bit so as to still fit in the window.
int frame_y = y - insets.top + menuBarHeight;
int frame_width = width + insets.left + insets.right;
// Add the height of the menubar to adjust the height so it still fits in
// the window.
int frame_height = height + insets.top + insets.bottom - menuBarHeight;
if (frame_x != awtComponent.getX()
|| frame_y != awtComponent.getY()
|| frame_width != awtComponent.getWidth()
|| frame_height != awtComponent.getHeight())
{
setBoundsCallback ((Window) awtComponent,
frame_x,
frame_y,
frame_width,
frame_height);
}
awtComponent.validate();
}
protected void postMouseEvent(int id, long when, int mods, int x, int y,
int clickCount, boolean popupTrigger)
{