
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
189 lines
5.5 KiB
Java
189 lines
5.5 KiB
Java
/* GtkFramePeer.java -- Implements FramePeer with GTK
|
|
Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package gnu.java.awt.peer.gtk;
|
|
|
|
import java.awt.Component;
|
|
import java.awt.Frame;
|
|
import java.awt.Graphics;
|
|
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;
|
|
|
|
public class GtkFramePeer extends GtkWindowPeer
|
|
implements FramePeer
|
|
{
|
|
int menuBarHeight = 0;
|
|
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 && 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)
|
|
{
|
|
super (frame);
|
|
}
|
|
|
|
void create ()
|
|
{
|
|
// Create a normal decorated window.
|
|
create (GDK_WINDOW_TYPE_HINT_NORMAL, true);
|
|
setMenuBar(((Frame) awtComponent).getMenuBar());
|
|
}
|
|
|
|
public void getArgs (Component component, GtkArgList args)
|
|
{
|
|
super.getArgs (component, args);
|
|
|
|
Frame frame = (Frame) component;
|
|
|
|
args.add ("title", frame.getTitle ());
|
|
args.add ("allow_shrink", frame.isResizable ());
|
|
args.add ("allow_grow", frame.isResizable ());
|
|
}
|
|
|
|
public void setIconImage (Image image)
|
|
{
|
|
/* TODO: Waiting on Toolkit Image routines */
|
|
}
|
|
|
|
public Graphics getGraphics ()
|
|
{
|
|
Graphics g;
|
|
if (GtkToolkit.useGraphics2D ())
|
|
g = new GdkGraphics2D (this);
|
|
else
|
|
g = new GdkGraphics (this);
|
|
g.translate (-insets.left, -insets.top);
|
|
return g;
|
|
}
|
|
|
|
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)
|
|
{
|
|
super.postMouseEvent (id, when, mods,
|
|
x + insets.left, y + insets.top,
|
|
clickCount, popupTrigger);
|
|
}
|
|
|
|
protected void postExposeEvent (int x, int y, int width, int height)
|
|
{
|
|
q.postEvent (new PaintEvent (awtComponent, PaintEvent.PAINT,
|
|
new Rectangle (x + insets.left,
|
|
y + insets.top,
|
|
width, height)));
|
|
}
|
|
|
|
public int getState ()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
public void setState (int state)
|
|
{
|
|
|
|
}
|
|
|
|
public void setMaximizedBounds (Rectangle r)
|
|
{
|
|
|
|
}
|
|
}
|
|
|
|
|