summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Barnes <krbarnes>2008-01-30 21:06:39 +0000
committerKevin Barnes <krbarnes>2008-01-30 21:06:39 +0000
commit7438525c049c3bbf23020e0ebd9bf9f49163a961 (patch)
tree9898c830951e4d6ed4760dd65d931315ddb664d9
parentf3f5de97b09c76fc06cab925ec5cfdbd8421c884 (diff)
downloadeclipse.platform.swt-7438525c049c3bbf23020e0ebd9bf9f49163a961.tar.gz
eclipse.platform.swt-7438525c049c3bbf23020e0ebd9bf9f49163a961.tar.xz
eclipse.platform.swt-7438525c049c3bbf23020e0ebd9bf9f49163a961.zip
217161 - List.getItemHeight can return 0
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/List.java18
1 files changed, 8 insertions, 10 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/List.java
index ccf68d232e..3c56921f2b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/List.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/wpf/org/eclipse/swt/widgets/List.java
@@ -365,16 +365,14 @@ public int getItemCount () {
*/
public int getItemHeight () {
checkWidget ();
- //FIXME: How to find default row height?
- int result = 15;
- if (OS.ItemsControl_HasItems (handle)) {
- int items = OS.ItemsControl_Items (handle);
- int item = OS.ItemCollection_GetItemAt (items, 0);
- OS.GCHandle_Free (items);
- result = (int) OS.FrameworkElement_ActualHeight (item);
- OS.GCHandle_Free (item);
- }
- return result;
+ //FIXME what is the default size?
+ if (!OS.ItemsControl_HasItems (handle)) return 16;
+ int items = OS.ItemsControl_Items (handle);
+ int item = OS.ItemCollection_GetItemAt (items, 0);
+ double height = OS.FrameworkElement_ActualHeight (item);
+ OS.GCHandle_Free (item);
+ OS.GCHandle_Free (items);
+ return height != 0 ? (int) height : 16;
}
/**