diff -r 4376525cdefb -r e5618cc85d74 javauis/lcdui_akn/javalcdui/javasrc.nokialcdui/com/nokia/mid/ui/TextEditor.java --- a/javauis/lcdui_akn/javalcdui/javasrc.nokialcdui/com/nokia/mid/ui/TextEditor.java Mon Jun 21 15:32:50 2010 +0300 +++ b/javauis/lcdui_akn/javalcdui/javasrc.nokialcdui/com/nokia/mid/ui/TextEditor.java Thu Jul 15 18:31:06 2010 +0300 @@ -149,9 +149,6 @@ // The current font of this text editor component private Font iFont; - // Indicates receiving of pointer events by the editor - private boolean iTouchEnabled; - // Text editor container for handling editor focusing. private static TextEditorContainer iEditorContainer; @@ -195,9 +192,8 @@ *

* *

- * On Series60-devices, if the MIDlet is manufacturer or operator-signed, - * the object returned by this method will also implement the - * com.nokia.mid.ui.s60.TextEditor + * On Series60-devices the object returned by this method will also + * implement the com.nokia.mid.ui.S60TextEditor. *

* * @param text @@ -259,9 +255,8 @@ *

* *

- * On Series60-devices, if the MIDlet is manufacturer or operator-signed, - * the object returned by this method will also implement the - * com.nokia.mid.ui.s60.TextEditor + * On Series60-devices the object returned by this method will also + * implement the com.nokia.mid.ui.S60TextEditor. *

* * @param maxSize @@ -619,41 +614,6 @@ } /** - * Specifies whether or not the editor will receive touch-events. - *

- * This is enabled by default. - * An editor with touch-event disabled won't be able to perform any - * touch-related functionality such as scrolling or positioning the - * cursor. It may however still be controlled via the - * virtual keypad/control-panel if that is enabled, or receive other + - * input e.g. via physical keys - *

- * @param enabled - * true to enabled touch-event, false to disable - */ - public void setTouchEnabled(boolean enabled) - { - if (iTouchEnabled != enabled) - { - synchronized (iToolkit) - { - _setTouchEnabled(getToolkitHandle(), iHandle, enabled); - iTouchEnabled = enabled; - } - } - } - - /** - * Gets the current touch-enabled state - *

- * @return true if the editor is touch-enabled, false otherwise - */ - public boolean isTouchEnabled() - { - return iTouchEnabled; - } - - /** *

* Returns the Z-position, or the elevation, of the item. The Z-position * decides the stacking order of neighboring items. @@ -885,17 +845,12 @@ font = Font.getDefaultFont(); } - int[] newSize = new int[2]; - synchronized (iToolkit) { - NativeError.check(_setFont(getToolkitHandle(), iHandle, - iLCDUIPackageInvoker.getFontHandle(font), newSize)); - + NativeError.check(_setFont(getToolkitHandle(), + iHandle, + iLCDUIPackageInvoker.getFontHandle(font))); iFont = font; - - iWidth = newSize[0]; - iHeight = newSize[1]; } } @@ -976,8 +931,6 @@ * rendered using given color value. The default highlight background * color is fully opaque black. * - * This method is not supported on S40 platform. - * * @param color * the color */ @@ -998,8 +951,6 @@ * using given color value. The default highlight foreground color is fully * opaque white. * - * This method is not supported on S40 platform. - * * @param color * the color */ @@ -1442,6 +1393,42 @@ } } + /** + * Gets the height of this TextEditor in pixels. + * + * @return height in pixels + */ + public int getHeight() + { + int[] size = doGetSize(); + return size[1]; + } + + /** + * Gets the width of this TextEditor in pixels. + * + * @return width in pixels + */ + public int getWidth() + { + int[] size = doGetSize(); + return size[0]; + } + + /* + * Gets TextEditor size in pixels - width, height. + */ + private int[] doGetSize() + { + int[] size = new int[2]; + synchronized (iToolkit) + { + NativeError.check(_getSize(getToolkitHandle(), iHandle, + size)); + } + return size; + } + /* * Disposes the Landmark native peer object, if the handles are valid. * Invalid (negative) handles indicate that their creation failed in the @@ -1529,17 +1516,12 @@ int handle = 0; - // The size of the editor must be known after construction. Use return - // values to store the height and width of the editor after - // construction. - int[] size = new int[2]; - synchronized (iToolkit) { // Create native peer object for this Java object. handle = _createNativePeer(getToolkitHandle(), maxSize, aWidth, aHeight, - aHeightInRows, size); + aHeightInRows); } // Check if construction failed and throw out of memory error. @@ -1548,14 +1530,6 @@ throw new OutOfMemoryError(); } - // Operation was a success, store size. - iWidth = size[0]; - iHeight = size[1]; - iMaxSize = maxSize; - - // Enabling receiving pointer events - iTouchEnabled = true; - // Sets parent to null iParent = null; @@ -1573,12 +1547,15 @@ // Set the constraints of the editor. The content is now empty. setConstraints(constraints); - // Set font to Java default font. - setFont(Font.getDefaultFont()); - + // Store the maxSize of the editor + iMaxSize = maxSize; + // Set the text. This now throws an exception if the content is not // valid for the current set of constraints. setContent(aContent); + + // Set font to Java default font. + setFont(Font.getDefaultFont()); } // Private methods. @@ -1678,8 +1655,7 @@ int maxSize, int aWidth, int aHeight, - boolean aHeightInRows, - int[] aSize); + boolean aHeightInRows); /* * Disposes the native side peer object. @@ -2114,16 +2090,13 @@ * @param aFont The application preferred font to be used in this * TextEditor. * - * @param aNewSize On return, contains the new size of the editor. - * * @return NativeError.KErrNone if the operation was successful. Otherwise, * a system-wide error code is returned. */ private native int _setFont( int aToolkitHandle, int aNativePeerHandle, - int aFont, - int[] aNewSize); + int aFont); /* * Sets a listener for this text editor. @@ -2172,21 +2145,16 @@ private native int _getZPosition(int aToolkitHandle, int aNativePeerHandle); /* - * Specifies whether or not the editor will receive touch-events. + * Gets the size of the text editor. + * + * @param aToolkitHandle A handle to the LCDUI toolkit. * - * This is enabled by default. - * An editor with touch-event disabled won't be able to perform any - * touch-related functionality such as scrolling or positioning the - * cursor. It may however still be controlled via the - * virtual keypad/control-panel if that is enabled, or receive other + - * input e.g. via physical keys + * @param aNativePeerHandle A handle to the native side peer object. * - * @param aEnabled - * true to enabled touch-event, false to disable + * @return The size of the TextEditor in pixels. */ - private native int _setTouchEnabled(int aToolkitHandle, - int aNativePeerHandle, boolean aEnabled); - + private native int _getSize(int aToolkitHandle, int aNativePeerHandle, + int[] aSize); } // End of file