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:26:26 UTC
svn commit: r1792559 - in
/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra:
TerraAlertSkin.java TerraPromptSkin.java
Author: rwhitcomb
Date: Tue Apr 25 00:26:26 2017
New Revision: 1792559
URL: http://svn.apache.org/viewvc?rev=1792559&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.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java?rev=1792559&r1=1792558&r2=1792559&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java Tue Apr 25 00:26:26 2017
@@ -20,6 +20,7 @@ import java.awt.Color;
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.Border;
@@ -184,6 +185,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/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java?rev=1792559&r1=1792558&r2=1792559&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java Tue Apr 25 00:26:26 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;
@@ -165,6 +166,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();