diff options
Diffstat (limited to 'libjava/gnu/java/awt/peer')
5 files changed, 50 insertions, 3 deletions
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java index 94603c0d3c9..a609f7ad818 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java @@ -47,6 +47,8 @@ public class GtkButtonPeer extends GtkComponentPeer { native void create (); + native void gtkSetFont(String xlfd, int size); + public GtkButtonPeer (Button b) { super (b); @@ -86,4 +88,9 @@ public class GtkButtonPeer extends GtkComponentPeer args.add ("label", ((Button)component).getLabel ()); } + + public void setFont (Font f) + { + gtkSetFont(((GtkFontPeer)f.getPeer()).getXLFD(), f.getSize()); + } } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java index 6e3b25290c8..b3a4525314e 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java @@ -88,6 +88,8 @@ public class GtkComponentPeer extends GtkGenericPeer awtComponent.setBackground (getBackground ()); // if (c.getFont () == null) // c.setFont (cp.getFont ()); + if (awtComponent.getFont() != null) + setFont(awtComponent.getFont()); if (! (awtComponent instanceof Window)) { @@ -273,6 +275,9 @@ public class GtkComponentPeer extends GtkGenericPeer public void setFont (Font f) { + // FIXME: This should really affect the widget tree below me. + // Currently this is only handled if the call is made directly on + // a text widget, which implements setFont() itself. } public void setForeground (Color c) @@ -352,7 +357,8 @@ public class GtkComponentPeer extends GtkGenericPeer p = component.getPeer (); } while (p instanceof java.awt.peer.LightweightPeer); - args.add ("parent", p); + if (p != null) + args.add ("parent", p); } native void set (String name, String value); diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFontPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkFontPeer.java index 47a46e81865..d3130a905e9 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkFontPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkFontPeer.java @@ -57,14 +57,34 @@ public class GtkFontPeer implements FontPeer } } - final private String Xname; + final private String Xname; // uses %d for font size. public GtkFontPeer (String name, int style) { if (bundle != null) Xname = bundle.getString (name.toLowerCase () + "." + style); else - Xname = "-*-*-medium-r-normal-*-12-*-*-*-c-*-*-*"; + { + String weight; + String slant; + String spacing; + + if (style == Font.ITALIC || (style == (Font.BOLD+Font.ITALIC))) + slant = "i"; + else + slant = "r"; + if (style == Font.BOLD || (style == (Font.BOLD+Font.ITALIC))) + weight = "bold"; + else + weight = "medium"; + if (name.equals("Serif") || name.equals("SansSerif") + || name.equals("Helvetica") || name.equals("Times")) + spacing = "p"; + else + spacing = "c"; + + Xname = "-*-*-" + weight + "-" + slant + "-normal-*-%d-*-*-*-" + spacing + "-*-*-*"; + } } public String getXLFD () diff --git a/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java index 7a648b913ad..ad83008cb8a 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java @@ -45,6 +45,8 @@ public class GtkTextAreaPeer extends GtkTextComponentPeer { native void create (int scrollbarVisibility); + native void gtkSetFont(String xlfd, int size); + void create () { create (((TextArea)awtComponent).getScrollbarVisibility ()); @@ -99,4 +101,9 @@ public class GtkTextAreaPeer extends GtkTextComponentPeer { insert (str, pos); } + + public void setFont (Font f) + { + gtkSetFont(((GtkFontPeer)f.getPeer()).getXLFD(), f.getSize()); + } } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java index 4dc23f8ba55..628cdd627ae 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java @@ -51,6 +51,8 @@ public class GtkTextFieldPeer extends GtkTextComponentPeer native void gtkEntryGetSize (int cols, int dims[]); + native void gtkSetFont(String xlfd, int size); + public GtkTextFieldPeer (TextField tf) { super (tf); @@ -95,4 +97,9 @@ public class GtkTextFieldPeer extends GtkTextComponentPeer { setEchoChar (c); } + + public void setFont (Font f) + { + gtkSetFont(((GtkFontPeer)f.getPeer()).getXLFD(), f.getSize()); + } } |
