summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorAnatoly Spektor2012-11-19 10:01:54 (EST)
committer Arun Thondapu2013-01-30 03:59:43 (EST)
commitffc9f40b7904f00bfd32f38d3b3ec04c8aced62e (patch)
tree0a308b460bcd089724b10030e0bcb3d94bfe4f8b
parent1dacd3e9ed06c61e8552e31c6adebb0ab30245ee (diff)
downloadeclipse.platform.swt-ffc9f40b7904f00bfd32f38d3b3ec04c8aced62e.zip
eclipse.platform.swt-ffc9f40b7904f00bfd32f38d3b3ec04c8aced62e.tar.gz
eclipse.platform.swt-ffc9f40b7904f00bfd32f38d3b3ec04c8aced62e.tar.bz2
Wrong sizing and trimming of Spinner widget in GTK+ 3
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java51
1 files changed, 36 insertions, 15 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java
index 9e36892..519f964 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java
@@ -227,12 +227,20 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
byte [] buffer2 = new byte [length];
OS.memmove (buffer2, ptr, length);
OS.pango_layout_set_text (layout, buffer1, buffer1.length);
- OS.pango_layout_get_pixel_size (layout, w, h);
OS.pango_layout_set_text (layout, buffer2, buffer2.length);
- int width = w [0];
- int height = h [0];
- width = wHint == SWT.DEFAULT ? width : wHint;
- height = hHint == SWT.DEFAULT ? height : hHint;
+ int width, height = 0 ;
+ OS.gtk_widget_realize (handle);
+ if (OS.GTK3) {
+ OS.gtk_widget_set_size_request (handle, wHint, hHint);
+ GtkRequisition requisition = new GtkRequisition ();
+ OS.gtk_widget_get_preferred_size (handle, requisition, null);
+ width = wHint == SWT.DEFAULT ? requisition.width : wHint;
+ height = hHint == SWT.DEFAULT ? requisition.height : hHint;
+ } else {
+ OS.pango_layout_get_pixel_size (layout, w, h);
+ width = wHint == SWT.DEFAULT ? w [0] : wHint;
+ height = hHint == SWT.DEFAULT ? h [0] : hHint;
+ }
Rectangle trim = computeTrim (0, 0, width, height);
return new Point (trim.width, trim.height);
}
@@ -240,10 +248,29 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget ();
int xborder = 0, yborder = 0;
- Point thickness = getThickness (handle);
- if ((this.style & SWT.BORDER) != 0) {
- xborder += thickness.x;
- yborder += thickness.y;
+ Rectangle trim = super.computeTrim (x, y, width, height);
+ if (OS.GTK3) {
+ GtkBorder tmp = new GtkBorder();
+ long /*int*/ context = OS.gtk_widget_get_style_context (handle);
+ OS.gtk_style_context_get_padding (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
+ if ((style & SWT.BORDER) != 0) {
+ OS.gtk_style_context_get_border (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
+ trim.x -= tmp.left;
+ trim.y -= tmp.top;
+ trim.width += tmp.left + tmp.right;
+ trim.height += tmp.top + tmp.bottom;
+ }
+ }else {
+ Point thickness = getThickness (handle);
+ if ((this.style & SWT.BORDER) != 0) {
+ xborder += thickness.x;
+ yborder += thickness.y;
+ }
+ long /*int*/ fontDesc = getFontDescription ();
+ int fontSize = OS.pango_font_description_get_size (fontDesc);
+ int arrowSize = Math.max (OS.PANGO_PIXELS (fontSize), MIN_ARROW_WIDTH);
+ arrowSize = arrowSize - arrowSize % 2;
+ trim.width += arrowSize + (2 * thickness.x);
}
int [] property = new int [1];
OS.gtk_widget_style_get (handle, OS.interior_focus, property, 0);
@@ -252,16 +279,10 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
xborder += property [0];
yborder += property [0];
}
- long /*int*/ fontDesc = getFontDescription ();
- int fontSize = OS.pango_font_description_get_size (fontDesc);
- int arrowSize = Math.max (OS.PANGO_PIXELS (fontSize), MIN_ARROW_WIDTH);
- arrowSize = arrowSize - arrowSize % 2;
- Rectangle trim = super.computeTrim (x, y, width, height);
trim.x -= xborder;
trim.y -= yborder;
trim.width += 2 * xborder;
trim.height += 2 * yborder;
- trim.width += arrowSize + (2 * thickness.x);
GtkBorder innerBorder = Display.getEntryInnerBorder (handle);
trim.x -= innerBorder.left;
trim.y -= innerBorder.top;