Changeset 4990

Timestamp:

07/01/08 08:05:15 (6 months ago)

Author:

risto.yrjana@…

Message:

Added partial caption functionality

Location:

incubator/widgets/popuppanel/src/com/itmill/toolkit

Files:

• tests/tickets/Ticket1397.java (modified) (1 diff)
• ui/gwt/client/ui/IPopupPanel.java (modified) (4 diffs)

incubator/widgets/popuppanel/src/com/itmill/toolkit/tests/tickets/Ticket1397.java

@@ -34 +34 @@
 
             public Component getPopupComponent() {
-                return new TextField(prop);
+                return new TextField("Edit foo", prop);
             }
         };

incubator/widgets/popuppanel/src/com/itmill/toolkit/ui/gwt/client/ui/IPopupPanel.java

@@ -9 +9 @@
 import com.google.gwt.user.client.ui.Widget;
 import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
+import com.itmill.toolkit.terminal.gwt.client.Caption;
+import com.itmill.toolkit.terminal.gwt.client.CaptionWrapper;
 import com.itmill.toolkit.terminal.gwt.client.Paintable;
 import com.itmill.toolkit.terminal.gwt.client.UIDL;
@@ -28 +30 @@
     private final PopupPanel popup = new PopupPanel(true); // true == autoHide
 
-    private Paintable popupComponent;
+    private Paintable popupComponentPaintable = null;
+    private Widget popupComponentWidget = null;
+    private CaptionWrapper captionWrapper = null;
 
     /**
@@ -52 +56 @@
         popup.addPopupListener(new PopupListener() {
             public void onPopupClosed(PopupPanel sender, boolean autoClosed) {
-                Widget popupWidget = popup.getWidget();
 
-                if (popupWidget instanceof ChangeListener) {
-                    ((ChangeListener) popupWidget).onChange(hostReference);
+                if (popupComponentWidget instanceof ChangeListener) {
+                    ((ChangeListener) popupComponentWidget)
+                            .onChange(hostReference);
                 }
                 updateState(false);
@@ -89 +93 @@
                     .getPaintable(popupComponentUIDL);
 
-            if (newPopupComponent != popupComponent) {
-                if (popupComponent != null) {
-                    client.unregisterPaintable(popupComponent);
+            if (newPopupComponent != popupComponentPaintable) {
+
+                if (popupComponentPaintable != null) {
+                    client.unregisterPaintable(popupComponentPaintable);
                 }
-                popup.setWidget((Widget) newPopupComponent);
-                popupComponent = newPopupComponent;
+
+                popupComponentPaintable = newPopupComponent;
+                popupComponentWidget = (Widget) newPopupComponent;
+
+                // Check for caption
+                if (Caption.isNeeded(popupComponentUIDL)) {
+                    captionWrapper = new CaptionWrapper(
+                            popupComponentPaintable, client);
+                    popup.setWidget(captionWrapper);
+                } else {
+                    popup.setWidget(popupComponentWidget);
+                }
             }
 
-            popupComponent.updateFromUIDL(popupComponentUIDL, client);
+            if (captionWrapper != null) {
+                captionWrapper.updateCaption(popupComponentUIDL);
+            }
+
+            popupComponentPaintable.updateFromUIDL(popupComponentUIDL, client);
 
         } else { // The popup isn't visible so we should remove it
-            if (popupComponent != null) {
-                client.unregisterPaintable(popupComponent);
+            if (captionWrapper != null) {
+                client.unregisterPaintable(captionWrapper.getPaintable());
             }
+
+            if (popupComponentPaintable != null) {
+                client.unregisterPaintable(popupComponentPaintable);
+            }
+
             popup.setWidget(null);
-            popupComponent = null;
+            popupComponentPaintable = null;
+            popupComponentWidget = null;
+            captionWrapper = null;
         }
     }// updateFromUIDL