From 1a0b3287870beca22b0a03aa604fc6a5574a962b Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 9 Jan 2014 18:34:33 +0100 Subject: Bug 676: Use proper pointer icon images (artwork) .. shameless inspired by KDE's Oxgen scheme .. (they are best) --- .../test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java | 12 ++++++------ .../opengl/test/junit/jogl/util/texture/PNGTstFiles.java | 8 ++++---- .../junit/jogl/util/texture/cross-grey-alpha-16x16.png | Bin 0 -> 286 bytes .../jogl/util/texture/crosshair-lumina-trans-32x32.png | Bin 213 -> 0 bytes .../jogl/util/texture/crosshair-lumina-trans-64x64.png | Bin 424 -> 0 bytes .../junit/jogl/util/texture/pointer-grey-alpha-16x24.png | Bin 0 -> 511 bytes .../newt/parenting/NewtAWTReparentingKeyAdapter.java | 14 +++++++------- 7 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 src/test/com/jogamp/opengl/test/junit/jogl/util/texture/cross-grey-alpha-16x16.png delete mode 100644 src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-32x32.png delete mode 100644 src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-64x64.png create mode 100644 src/test/com/jogamp/opengl/test/junit/jogl/util/texture/pointer-grey-alpha-16x24.png (limited to 'src/test') diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java index 780338492..059a930ed 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java @@ -179,9 +179,9 @@ public class TestGearsES2NEWT extends UITestCase { disp.createNative(); { PointerIcon _pointerIcon = null; - final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "newt/data/crosshair-lumina-trans-32x32.png" } ); + final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "newt/data/cross-grey-alpha-16x16.png" } ); try { - _pointerIcon = disp.createPointerIcon(res, 16, 16); + _pointerIcon = disp.createPointerIcon(res, 8, 8); System.err.println("Create PointerIcon #01: "+_pointerIcon); } catch (Exception e) { e.printStackTrace(); @@ -190,9 +190,9 @@ public class TestGearsES2NEWT extends UITestCase { } { PointerIcon _pointerIcon = null; - final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "jogamp-pointer-64x64.png" } ); + final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "newt/data/pointer-grey-alpha-16x24.png" } ); try { - _pointerIcon = disp.createPointerIcon(res, 32, 0); + _pointerIcon = disp.createPointerIcon(res, 0, 0); System.err.println("Create PointerIcon #02: "+_pointerIcon); } catch (Exception e) { e.printStackTrace(); @@ -201,12 +201,12 @@ public class TestGearsES2NEWT extends UITestCase { } { PointerIcon _pointerIcon = null; - final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "crosshair-lumina-trans-64x64.png" } ); + final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "jogamp-pointer-64x64.png" } ); try { final URLConnection urlConn = res.resolve(0); final PNGPixelRect image = PNGPixelRect.read(urlConn.getInputStream(), null, false /* directBuffer */, 0 /* destMinStrideInBytes */, false /* destIsGLOriented */); System.err.println("Create PointerIcon #03: "+image); - _pointerIcon = disp.createPointerIcon(image, 32, 32); + _pointerIcon = disp.createPointerIcon(image, 32, 0); System.err.println("Create PointerIcon #03: "+_pointerIcon); } catch (Exception e) { e.printStackTrace(); diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/PNGTstFiles.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/PNGTstFiles.java index bb9bc42a8..e3ad7fc03 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/PNGTstFiles.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/PNGTstFiles.java @@ -41,14 +41,14 @@ public class PNGTstFiles { "grayscale_texture", "bug724-transparent-grey_orig", "bug724-transparent-grey_gimpexp", - "crosshair-lumina-trans-32x32", - "crosshair-lumina-trans-64x64", + "cross-gray-alpha-16x16", + "pointer-gray-alpha-16x24", }; static public final String[] greyBasenames = { "grayscale_texture", "bug724-transparent-grey_orig", "bug724-transparent-grey_gimpexp", - "crosshair-lumina-trans-32x32", - "crosshair-lumina-trans-64x64", + "cross-gray-alpha-16x16", + "pointer-gray-alpha-16x24", }; } diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/cross-grey-alpha-16x16.png b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/cross-grey-alpha-16x16.png new file mode 100644 index 000000000..303c454fa Binary files /dev/null and b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/cross-grey-alpha-16x16.png differ diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-32x32.png b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-32x32.png deleted file mode 100644 index 92279640b..000000000 Binary files a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-32x32.png and /dev/null differ diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-64x64.png b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-64x64.png deleted file mode 100644 index 9be285335..000000000 Binary files a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-64x64.png and /dev/null differ diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/pointer-grey-alpha-16x24.png b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/pointer-grey-alpha-16x24.png new file mode 100644 index 000000000..98b2c8640 Binary files /dev/null and b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/pointer-grey-alpha-16x24.png differ diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/NewtAWTReparentingKeyAdapter.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/NewtAWTReparentingKeyAdapter.java index 70d01ae66..dc9aac8ea 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/NewtAWTReparentingKeyAdapter.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/NewtAWTReparentingKeyAdapter.java @@ -152,9 +152,9 @@ public class NewtAWTReparentingKeyAdapter extends KeyAdapter { final Display disp = glWindow.getScreen().getDisplay(); { PointerIcon _pointerIcon = null; - final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "newt/data/crosshair-lumina-trans-32x32.png" } ); + final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "newt/data/cross-grey-alpha-16x16.png" } ); try { - _pointerIcon = disp.createPointerIcon(res, 16, 16); + _pointerIcon = disp.createPointerIcon(res, 8, 8); System.err.println("Create PointerIcon #01: "+_pointerIcon); } catch (Exception ex) { ex.printStackTrace(); @@ -163,9 +163,9 @@ public class NewtAWTReparentingKeyAdapter extends KeyAdapter { } { PointerIcon _pointerIcon = null; - final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "jogamp-pointer-64x64.png" } ); + final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "newt/data/pointer-grey-alpha-16x24.png" } ); try { - _pointerIcon = disp.createPointerIcon(res, 32, 0); + _pointerIcon = disp.createPointerIcon(res, 0, 0); System.err.println("Create PointerIcon #02: "+_pointerIcon); } catch (Exception ex) { ex.printStackTrace(); @@ -174,12 +174,12 @@ public class NewtAWTReparentingKeyAdapter extends KeyAdapter { } { PointerIcon _pointerIcon = null; - final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "crosshair-lumina-trans-64x64.png" } ); + final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "jogamp-pointer-64x64.png" } ); try { final URLConnection urlConn = res.resolve(0); final PNGPixelRect image = PNGPixelRect.read(urlConn.getInputStream(), null, false /* directBuffer */, 0 /* destMinStrideInBytes */, false /* destIsGLOriented */); System.err.println("Create PointerIcon #03: "+image); - _pointerIcon = disp.createPointerIcon(image, 32, 32); + _pointerIcon = disp.createPointerIcon(image, 32, 0); System.err.println("Create PointerIcon #03: "+_pointerIcon); } catch (Exception ex) { ex.printStackTrace(); @@ -231,4 +231,4 @@ public class NewtAWTReparentingKeyAdapter extends KeyAdapter { } }.start(); } } -} \ No newline at end of file +} -- cgit v1.2.3