From 4c9edffc8504a496cdd27616c294d045ff41879d Mon Sep 17 00:00:00 2001
From: Elias Naur <elias.naur@gmail.com>
Date: Sat, 22 Jul 2006 21:30:31 +0000
Subject: [PATCH] Linux: Remove 32x32 icons size check, since other sizes seem
 to work alright. Document the fact that Display.setIcon use the icons from
 the icon array in order of decreasing preference

---
 src/java/org/lwjgl/opengl/Display.java      | 4 ++--
 src/java/org/lwjgl/opengl/LinuxDisplay.java | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/java/org/lwjgl/opengl/Display.java b/src/java/org/lwjgl/opengl/Display.java
index bf51f722..0a289da1 100644
--- a/src/java/org/lwjgl/opengl/Display.java
+++ b/src/java/org/lwjgl/opengl/Display.java
@@ -273,7 +273,7 @@ public final class Display {
 		if(cached_icons != null) {
 			setIcon(cached_icons);
 		} else {
-			setIcon(new ByteBuffer[] { LWJGLUtil.LWJGLIcon16x16, LWJGLUtil.LWJGLIcon32x32 });
+			setIcon(new ByteBuffer[] { LWJGLUtil.LWJGLIcon32x32, LWJGLUtil.LWJGLIcon16x16 });
 		}
 	}
 
@@ -879,7 +879,7 @@ public final class Display {
 	 * of recreating the icons when you go back and forth fullscreen mode. You therefore only need to 
 	 * set the icon once per instance.
 	 *
-	 * @param icons Array of icons in RGBA mode
+	 * @param icons Array of icons in RGBA mode. Pass the icons in order of preference.
 	 * @return number of icons used, or 0 if display hasn't been created
 	 */
 	public static int setIcon(ByteBuffer[] icons) {
diff --git a/src/java/org/lwjgl/opengl/LinuxDisplay.java b/src/java/org/lwjgl/opengl/LinuxDisplay.java
index df9498c2..ad99248a 100644
--- a/src/java/org/lwjgl/opengl/LinuxDisplay.java
+++ b/src/java/org/lwjgl/opengl/LinuxDisplay.java
@@ -949,11 +949,9 @@ final class LinuxDisplay implements DisplayImplementation {
 				for (int i=0;i<icons.length;i++) {
 					int size = icons[i].limit() / 4;
 					int dimension = (int)Math.sqrt(size);
-					if (dimension == 32) {
-						ByteBuffer icon = convertIcon(icons[i], dimension, dimension);
-						nSetWindowIcon(icon, icon.capacity(), dimension, dimension);
-						return 1;
-					}
+					ByteBuffer icon = convertIcon(icons[i], dimension, dimension);
+					nSetWindowIcon(icon, icon.capacity(), dimension, dimension);
+					return 1;
 				}
 				return 0;
 			} finally {