Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 156365 Details for
Bug 299914
Some widgets with zero size are still visible
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Proposed patch
Bug-299914.patch (text/plain), 15.22 KB, created by
Ivan Furnadjiev
on 2010-01-18 05:10:10 EST
(
hide
)
Description:
Proposed patch
Filename:
MIME Type:
Creator:
Ivan Furnadjiev
Created:
2010-01-18 05:10:10 EST
Size:
15.22 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.rap.rwt.q07 >Index: src/org/eclipse/rwt/lifecycle/ControlLCAUtil.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/rwt/lifecycle/ControlLCAUtil.java,v >retrieving revision 1.23 >diff -u -r1.23 ControlLCAUtil.java >--- src/org/eclipse/rwt/lifecycle/ControlLCAUtil.java 11 Jan 2010 15:46:58 -0000 1.23 >+++ src/org/eclipse/rwt/lifecycle/ControlLCAUtil.java 18 Jan 2010 10:08:34 -0000 >@@ -128,7 +128,7 @@ > adapter.preserve( PROP_TAB_INDEX, new Integer( getTabIndex( control ) ) ); > WidgetLCAUtil.preserveToolTipText( control, control.getToolTipText() ); > adapter.preserve( Props.MENU, control.getMenu() ); >- adapter.preserve( Props.VISIBLE, Boolean.valueOf( control.getVisible() ) ); >+ adapter.preserve( Props.VISIBLE, Boolean.valueOf( getVisible( control ) ) ); > WidgetLCAUtil.preserveEnabled( control, control.getEnabled() ); > IControlAdapter controlAdapter > = ( IControlAdapter )control.getAdapter( IControlAdapter.class ); >@@ -220,12 +220,19 @@ > { > // we only need getVisible here (not isVisible), as qooxdoo also hides/shows > // contained controls >- Boolean newValue = Boolean.valueOf( control.getVisible() ); >+ Boolean newValue = Boolean.valueOf( getVisible( control ) ); > Boolean defValue = control instanceof Shell ? Boolean.FALSE : Boolean.TRUE; > JSWriter writer = JSWriter.getWriterFor( control ); > writer.set( Props.VISIBLE, JSConst.QX_FIELD_VISIBLE, newValue, defValue ); > } > >+ // [if] Fix for bug 263025, 297466, 223873 and more >+ // some qooxdoo widget with size (0,0) are not invisible >+ private static boolean getVisible( final Control control ) { >+ Point size = control.getSize(); >+ return control.getVisible() && size.x > 0 && size.y > 0; >+ } >+ > /** > * Determines whether the property <code>enabled</code> of the given control > * has changed during the processing of the current request and if so, writes >#P org.eclipse.rap.rwt.q07.test >Index: src/org/eclipse/swt/internal/widgets/spinnerkit/SpinnerLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/spinnerkit/SpinnerLCA_Test.java,v >retrieving revision 1.6 >diff -u -r1.6 SpinnerLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/spinnerkit/SpinnerLCA_Test.java 11 Dec 2009 15:19:47 -0000 1.6 >+++ src/org/eclipse/swt/internal/widgets/spinnerkit/SpinnerLCA_Test.java 18 Jan 2010 10:08:37 -0000 >@@ -103,6 +103,7 @@ > assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) ); > Fixture.clearPreserved(); > // visible >+ spinner.setSize( 10, 10 ); > Fixture.preserveWidgets(); > adapter = WidgetUtil.getAdapter( spinner ); > assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) ); >Index: src/org/eclipse/swt/internal/widgets/datetimekit/DateTimeLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/datetimekit/DateTimeLCA_Test.java,v >retrieving revision 1.6 >diff -u -r1.6 DateTimeLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/datetimekit/DateTimeLCA_Test.java 11 Dec 2009 15:19:47 -0000 1.6 >+++ src/org/eclipse/swt/internal/widgets/datetimekit/DateTimeLCA_Test.java 18 Jan 2010 10:08:37 -0000 >@@ -197,6 +197,7 @@ > assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) ); > Fixture.clearPreserved(); > // visible >+ dateTime.setSize( 10, 10 ); > Fixture.preserveWidgets(); > adapter = WidgetUtil.getAdapter( dateTime ); > assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) ); >Index: src/org/eclipse/swt/internal/widgets/linkkit/LinkLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/linkkit/LinkLCA_Test.java,v >retrieving revision 1.7 >diff -u -r1.7 LinkLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/linkkit/LinkLCA_Test.java 11 Dec 2009 15:19:46 -0000 1.7 >+++ src/org/eclipse/swt/internal/widgets/linkkit/LinkLCA_Test.java 18 Jan 2010 10:08:37 -0000 >@@ -68,6 +68,7 @@ > assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) ); > Fixture.clearPreserved(); > //visible >+ link.setSize( 10, 10 ); > Fixture.preserveWidgets(); > adapter = WidgetUtil.getAdapter( link ); > assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) ); >Index: src/org/eclipse/swt/internal/widgets/treekit/TreeLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/treekit/TreeLCA_Test.java,v >retrieving revision 1.7 >diff -u -r1.7 TreeLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/treekit/TreeLCA_Test.java 11 Dec 2009 15:19:47 -0000 1.7 >+++ src/org/eclipse/swt/internal/widgets/treekit/TreeLCA_Test.java 18 Jan 2010 10:08:39 -0000 >@@ -107,6 +107,7 @@ > assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) ); > Fixture.clearPreserved(); > // visible >+ tree.setSize( 10, 10 ); > Fixture.preserveWidgets(); > adapter = WidgetUtil.getAdapter( tree ); > assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) ); >Index: src/org/eclipse/swt/internal/widgets/tablekit/TableLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/tablekit/TableLCA_Test.java,v >retrieving revision 1.24 >diff -u -r1.24 TableLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/tablekit/TableLCA_Test.java 11 Dec 2009 15:19:46 -0000 1.24 >+++ src/org/eclipse/swt/internal/widgets/tablekit/TableLCA_Test.java 18 Jan 2010 10:08:39 -0000 >@@ -162,6 +162,7 @@ > assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) ); > Fixture.clearPreserved(); > // visible >+ table.setSize( 10, 10 ); > Fixture.preserveWidgets(); > adapter = WidgetUtil.getAdapter( table ); > assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) ); >Index: src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA_Test.java,v >retrieving revision 1.3 >diff -u -r1.3 TabFolderLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA_Test.java 11 Dec 2009 15:19:47 -0000 1.3 >+++ src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA_Test.java 18 Jan 2010 10:08:38 -0000 >@@ -50,6 +50,7 @@ > assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) ); > Fixture.clearPreserved(); > //visible >+ tabfolder.setSize( 10, 10 ); > Fixture.preserveWidgets(); > adapter = WidgetUtil.getAdapter( tabfolder ); > assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) ); >@@ -200,9 +201,9 @@ > assertFalse( control0.getVisible() ); > assertTrue( control1.getVisible() ); > } >- >+ > public void testSelectionWithListener() { >- final java.util.List events = new ArrayList(); >+ final java.util.List events = new ArrayList(); > Display display = new Display(); > Shell shell = new Shell( display ); > shell.setLayout( new FillLayout() ); >@@ -224,7 +225,7 @@ > events.add( event ); > } > } ); >- >+ > RWTLifeCycle lifeCycle = ( RWTLifeCycle )LifeCycleFactory.getLifeCycle(); > lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > String displayId = DisplayUtil.getAdapter( display ).getId(); >@@ -237,13 +238,13 @@ > Fixture.fakeNewRequest(); > Fixture.fakeRequestParam( RequestParams.UIROOT, displayId ); > Fixture.executeLifeCycleFromServerThread( ); >- >+ > events.clear(); > Fixture.fakeNewRequest(); > Fixture.fakeRequestParam( RequestParams.UIROOT, displayId ); > Fixture.fakeRequestParam( JSConst.EVENT_WIDGET_SELECTED, folderId ); > Fixture.fakeRequestParam( JSConst.EVENT_WIDGET_SELECTED_ITEM, item1Id ); >- >+ > Fixture.executeLifeCycleFromServerThread( ); > assertEquals( 1, folder.getSelectionIndex() ); > assertFalse( control0.getVisible() ); >Index: src/org/eclipse/swt/internal/widgets/controlkit/ControlLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/controlkit/ControlLCA_Test.java,v >retrieving revision 1.6 >diff -u -r1.6 ControlLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/controlkit/ControlLCA_Test.java 11 Dec 2009 15:19:46 -0000 1.6 >+++ src/org/eclipse/swt/internal/widgets/controlkit/ControlLCA_Test.java 18 Jan 2010 10:08:36 -0000 >@@ -152,6 +152,7 @@ > Display display = new Display(); > Shell shell = new Shell( display , SWT.NONE ); > Button button = new Button( shell, SWT.PUSH ); >+ button.setSize( 10, 10 ); > shell.open(); > AbstractWidgetLCA lca = WidgetUtil.getLCA( button ); > >Index: src/org/eclipse/swt/internal/widgets/sashkit/SashLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/sashkit/SashLCA_Test.java,v >retrieving revision 1.5 >diff -u -r1.5 SashLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/sashkit/SashLCA_Test.java 11 Dec 2009 15:19:47 -0000 1.5 >+++ src/org/eclipse/swt/internal/widgets/sashkit/SashLCA_Test.java 18 Jan 2010 10:08:37 -0000 >@@ -62,6 +62,7 @@ > assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) ); > Fixture.clearPreserved(); > //visible >+ sash.setSize( 10, 10 ); > Fixture.preserveWidgets(); > adapter = WidgetUtil.getAdapter( sash ); > assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) ); >@@ -191,7 +192,7 @@ > SashLCA sashLCA = new SashLCA(); > sashLCA.renderChanges( sash ); > assertTrue( Fixture.getAllMarkup() >- .endsWith( "setSpace( 20, 50, 100, 60 );" ) ); >+ .indexOf( "setSpace( 20, 50, 100, 60 );" ) != -1 ); > Fixture.clearPreserved(); > Fixture.fakeResponseWriter(); > Fixture.preserveWidgets(); >Index: src/org/eclipse/swt/internal/widgets/coolbarkit/CoolBarLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/coolbarkit/CoolBarLCA_Test.java,v >retrieving revision 1.7 >diff -u -r1.7 CoolBarLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/coolbarkit/CoolBarLCA_Test.java 11 Dec 2009 15:19:46 -0000 1.7 >+++ src/org/eclipse/swt/internal/widgets/coolbarkit/CoolBarLCA_Test.java 18 Jan 2010 10:08:36 -0000 >@@ -57,6 +57,7 @@ > assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) ); > Fixture.clearPreserved(); > // visible >+ bar.setSize( 10, 10 ); > lca.preserveValues( bar ); > adapter = WidgetUtil.getAdapter( bar ); > assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) ); >@@ -210,12 +211,12 @@ > // get adapter to set item order > Object adapter = bar.getAdapter( ICoolBarAdapter.class ); > ICoolBarAdapter cba = (ICoolBarAdapter) adapter; >- >+ > // ensure initial state > assertEquals( 0, bar.getItemOrder()[ 0 ] ); > assertEquals( 1, bar.getItemOrder()[ 1 ] ); > assertEquals( 2, bar.getItemOrder()[ 2 ] ); >- >+ > // Simulate that item2 is dragged left of item1 > int newX = item1.getBounds().x - 4; > Fixture.fakeRequestParam( JSConst.EVENT_WIDGET_MOVED, item2Id ); >@@ -224,7 +225,7 @@ > assertEquals( 0, bar.getItemOrder()[ 0 ] ); > assertEquals( 2, bar.getItemOrder()[ 1 ] ); > assertEquals( 1, bar.getItemOrder()[ 2 ] ); >- >+ > // Simulate that item0 is dragged after the last item > cba.setItemOrder( new int[] { 0, 1, 2, } ); > newX = item2.getBounds().x + item2.getBounds().width + 10; >@@ -234,7 +235,7 @@ > assertEquals( 1, bar.getItemOrder()[ 0 ] ); > assertEquals( 2, bar.getItemOrder()[ 1 ] ); > assertEquals( 0, bar.getItemOrder()[ 2 ] ); >- >+ > // Simulate that item0 is dragged onto itself -> nothing should change > cba.setItemOrder( new int[] { 0, 1, 2, } ); > newX = item0.getBounds().x + 2; >@@ -244,7 +245,7 @@ > assertEquals( 0, bar.getItemOrder()[ 0 ] ); > assertEquals( 1, bar.getItemOrder()[ 1 ] ); > assertEquals( 2, bar.getItemOrder()[ 2 ] ); >- >+ > // Simulate that item1 is before the first item > cba.setItemOrder( new int[] { 0, 1, 2, } ); > newX = item0.getBounds().x - 5; >@@ -255,7 +256,7 @@ > assertEquals( 0, bar.getItemOrder()[ 1 ] ); > assertEquals( 2, bar.getItemOrder()[ 2 ] ); > } >- >+ > public void testItemReordering2() { > Display display = new Display(); > Shell shell = new Shell( display, SWT.NONE ); >@@ -280,7 +281,7 @@ > Fixture.markInitialized( item0.getControl() ); > Fixture.markInitialized( item1 ); > Fixture.markInitialized( item1.getControl() ); >- >+ > // get adapter to set item order > Object adapter = bar.getAdapter( ICoolBarAdapter.class ); > ICoolBarAdapter cba = (ICoolBarAdapter) adapter; >@@ -295,7 +296,7 @@ > Fixture.executeLifeCycleFromServerThread(); > assertEquals( 1, bar.getItemOrder()[ 0 ] ); > assertEquals( 0, bar.getItemOrder()[ 1 ] ); >- >+ > // Drag item0 and drop it beyond the bounds of item1 > cba.setItemOrder( new int[] { 0, 1 } ); > Fixture.fakeNewRequest(); >@@ -307,7 +308,7 @@ > assertEquals( 1, bar.getItemOrder()[ 0 ] ); > assertEquals( 0, bar.getItemOrder()[ 1 ] ); > } >- >+ > public void testSnapBackItemMoved() { > Display display = new Display(); > Shell shell = new Shell( display, SWT.NONE ); >@@ -331,11 +332,11 @@ > Fixture.markInitialized( item0.getControl() ); > Fixture.markInitialized( item1 ); > Fixture.markInitialized( item1.getControl() ); >- >+ > // get adapter to set item order > Object adapter = bar.getAdapter( ICoolBarAdapter.class ); > ICoolBarAdapter cba = (ICoolBarAdapter) adapter; >- >+ > // Simulate that fist item is dragged around but dropped at its original > // position > cba.setItemOrder( new int[] { 0, 1 } ); >Index: src/org/eclipse/swt/internal/widgets/listkit/ListLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/listkit/ListLCA_Test.java,v >retrieving revision 1.6 >diff -u -r1.6 ListLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/listkit/ListLCA_Test.java 11 Dec 2009 15:19:46 -0000 1.6 >+++ src/org/eclipse/swt/internal/widgets/listkit/ListLCA_Test.java 18 Jan 2010 10:08:37 -0000 >@@ -99,6 +99,7 @@ > assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) ); > Fixture.clearPreserved(); > // visible >+ list.setSize( 10, 10 ); > Fixture.preserveWidgets(); > adapter = WidgetUtil.getAdapter( list ); > assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 299914
: 156365