aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2014-04-02 03:29:48 (EDT)
committerAlexander Kurtakov2014-04-02 03:29:48 (EDT)
commit0854ee343a9a2f7b225cfa849ae690c61a29f135 (patch)
treed085c400b1e6cd4a7d3bc9e5962f06948e20f7a8
parent3024a4845dd0062c8584cea1b092dd290e46f496 (diff)
downloadeclipse.platform.swt-0854ee343a9a2f7b225cfa849ae690c61a29f135.zip
eclipse.platform.swt-0854ee343a9a2f7b225cfa849ae690c61a29f135.tar.gz
eclipse.platform.swt-0854ee343a9a2f7b225cfa849ae690c61a29f135.tar.xz
Bug 421834 - Some bold text with Luna 4.4.M3/GTK3refs/changes/02/24302/1
Fix Combo box inheriting font. Change-Id: I0529cda52d1be2e76047a42de1ca3d130221a704 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
index 6db2aee..ea5a93e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
@@ -509,6 +509,11 @@ void createHandle (int index) {
if ((style & SWT.READ_ONLY) != 0 && buttonHandle != 0) {
gtk_widget_set_receives_default (buttonHandle, false);
}
+ // In GTK 3 font description is inherited from parent widget which is not how SWT has always worked,
+ // reset to default font to get the usual behavior
+ if (OS.GTK3) {
+ setFontDescription(defaultFont().handle);
+ }
}
/**