diff options
| author | Felipe Heidrich <fheidric> | 2008-11-18 16:13:19 +0000 |
|---|---|---|
| committer | Felipe Heidrich <fheidric> | 2008-11-18 16:13:19 +0000 |
| commit | 027554508ae2fd1b942bc226a441a944960500f0 (patch) | |
| tree | a06a8a7693c1c2090dc9cfab748db867861b2ec5 /bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java | |
| parent | a3cb57f480ed89d1ab9d4900fdfc0d4bbd8be104 (diff) | |
| download | eclipse.platform.swt-027554508ae2fd1b942bc226a441a944960500f0.tar.gz eclipse.platform.swt-027554508ae2fd1b942bc226a441a944960500f0.tar.xz eclipse.platform.swt-027554508ae2fd1b942bc226a441a944960500f0.zip | |
remove fix for 222582 (the fix for 236513 fixes 222582 as well)
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java index 5976e865a5..5bc6d090fa 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java @@ -389,20 +389,9 @@ public void setAlignment (int alignment) { } void setAlignment () { - boolean isRTL = (style & SWT.RIGHT_TO_LEFT) != 0; - if (text != null && text.length () != 0) { - if (OS.GTK_VERSION >= OS.VERSION(2, 4, 0)) { - int /*long*/ layout = OS.gtk_label_get_layout (labelHandle); - int /*long*/ linePtr = OS.pango_layout_get_line (layout, 0); - int resolved_dir = OS.pango_layout_line_get_resolved_dir (linePtr); - if (resolved_dir == OS.PANGO_DIRECTION_RTL) { - isRTL = !isRTL; - } - } - } if ((style & SWT.LEFT) != 0) { OS.gtk_misc_set_alignment (labelHandle, 0.0f, 0.0f); - OS.gtk_label_set_justify (labelHandle, isRTL ? OS.GTK_JUSTIFY_RIGHT : OS.GTK_JUSTIFY_LEFT); + OS.gtk_label_set_justify (labelHandle, OS.GTK_JUSTIFY_LEFT); OS.gtk_misc_set_alignment (imageHandle, 0.0f, 0.5f); return; } @@ -414,7 +403,7 @@ void setAlignment () { } if ((style & SWT.RIGHT) != 0) { OS.gtk_misc_set_alignment (labelHandle, 1.0f, 0.0f); - OS.gtk_label_set_justify (labelHandle, isRTL ? OS.GTK_JUSTIFY_LEFT : OS.GTK_JUSTIFY_RIGHT); + OS.gtk_label_set_justify (labelHandle, OS.GTK_JUSTIFY_RIGHT); OS.gtk_misc_set_alignment (imageHandle, 1.0f, 0.5f); return; } @@ -566,7 +555,6 @@ public void setText (String string) { OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer); OS.gtk_widget_hide (imageHandle); OS.gtk_widget_show (labelHandle); - setAlignment (); } void showWidget () { |