You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2017/04/25 00:28:12 UTC

svn commit: r1792561 - in /pivot/branches/2.0.x: ./ wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java

Author: rwhitcomb
Date: Tue Apr 25 00:28:12 2017
New Revision: 1792561

URL: http://svn.apache.org/viewvc?rev=1792561&view=rev
Log:
PIVOT-995: Need to reload the "typeImageView" after an Alert or Prompt window
close event has cleared it, when the window is re-opened.
Otherwise the message type icon will not be shown.

This is a merge of revision 1792559 from "trunk" to "branches/2.0.x".

Modified:
    pivot/branches/2.0.x/   (props changed)
    pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java
    pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java

Propchange: pivot/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 25 00:28:12 2017
@@ -1 +1 @@
-/pivot/trunk:1346574,1347051,1394847,1394858,1398511,1399331,1401781,1405882,1407585,1409081,1410536,1410555,1417081,1417258,1428056,1428650,1435351,1436707,1438126,1438659,1444260,1444910,1502657,1510821,1516518,1519859,1522078,1523205,1523736,1523776,1525982,1526005,1536829,1537222,1604238,1610563,1611829,1614462,1624381,1675204,1675517,1678238,1678251,1687873-1687874,1688306,1688484,1688523,1691618,1712175,1717360,1727931,1728247,1729480,1729493,1730100,1730108,1735181,1735282,1740570,1747445,1750549,1756534,1783447,1792531,1792556
+/pivot/trunk:1346574,1347051,1394847,1394858,1398511,1399331,1401781,1405882,1407585,1409081,1410536,1410555,1417081,1417258,1428056,1428650,1435351,1436707,1438126,1438659,1444260,1444910,1502657,1510821,1516518,1519859,1522078,1523205,1523736,1523776,1525982,1526005,1536829,1537222,1604238,1610563,1611829,1614462,1624381,1675204,1675517,1678238,1678251,1687873-1687874,1688306,1688484,1688523,1691618,1712175,1717360,1727931,1728247,1729480,1729493,1730100,1730108,1735181,1735282,1740570,1747445,1750549,1756534,1783447,1792531,1792556,1792559

Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java?rev=1792561&r1=1792560&r2=1792561&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java Tue Apr 25 00:28:12 2017
@@ -18,6 +18,7 @@ package org.apache.pivot.wtk.skin.terra;
 
 import org.apache.pivot.beans.BXMLSerializer;
 import org.apache.pivot.collections.Sequence;
+import org.apache.pivot.util.Vote;
 import org.apache.pivot.wtk.Alert;
 import org.apache.pivot.wtk.AlertListener;
 import org.apache.pivot.wtk.BoxPane;
@@ -167,6 +168,19 @@ public class TerraAlertSkin extends Terr
     }
 
     @Override
+    public Vote previewWindowOpen(Window window) {
+        Vote vote = super.previewWindowOpen(window);
+        switch (vote) {
+            case APPROVE:
+                // If this is the second or subsequent open, then the
+                // image view has been cleared, so set it up again
+                messageTypeChanged((Alert)window, null);
+                break;
+        }
+        return vote;
+    }
+
+    @Override
     public void dialogClosed(Dialog dialog, boolean modal) {
         super.dialogClosed(dialog, modal);
         typeImageView.clearImage();

Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java?rev=1792561&r1=1792560&r2=1792561&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java Tue Apr 25 00:28:12 2017
@@ -18,6 +18,7 @@ package org.apache.pivot.wtk.skin.terra;
 
 import org.apache.pivot.beans.BXMLSerializer;
 import org.apache.pivot.collections.Sequence;
+import org.apache.pivot.util.Vote;
 import org.apache.pivot.wtk.BoxPane;
 import org.apache.pivot.wtk.Button;
 import org.apache.pivot.wtk.ButtonPressListener;
@@ -167,6 +168,19 @@ public class TerraPromptSkin extends Ter
     }
 
     @Override
+    public Vote previewWindowOpen(Window window) {
+        Vote vote = super.previewWindowOpen(window);
+        switch (vote) {
+            case APPROVE:
+                // If this is the second or subsequent open, then the
+                // image view has been cleared, so set it up again
+                messageTypeChanged((Prompt)window, null);
+                break;
+        }
+        return vote;
+    }
+
+    @Override
     public void sheetClosed(Sheet sheet) {
         super.sheetClosed(sheet);
         typeImageView.clearImage();