You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/10/05 22:19:08 UTC
svn commit: r1004804 - in /pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra: TerraAlertSkin.java TerraPromptSkin.java TerraSheetSkin.java

Author: gbrown
Date: Tue Oct  5 20:19:08 2010
New Revision: 1004804

URL: http://svn.apache.org/viewvc?rev=1004804&view=rev
Log:
Tweak preferred size settings in Alert and Prompt.

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
    pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.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=1004804&r1=1004803&r2=1004804&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 Oct  5 20:19:08 2010
@@ -64,7 +64,8 @@ public class TerraAlertSkin extends Terr
         super.install(component);
 
         Alert alert = (Alert)component;
-        alert.setPreferredWidth(300);
+        alert.setPreferredWidth(320);
+        alert.setMinimumWidth(160);
 
         alert.getAlertListeners().add(this);
 

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=1004804&r1=1004803&r2=1004804&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 Oct  5 20:19:08 2010
@@ -63,7 +63,8 @@ public class TerraPromptSkin extends Ter
         super.install(component);
 
         Prompt prompt = (Prompt)component;
-        prompt.setPreferredWidth(300);
+        prompt.setPreferredWidth(320);
+        prompt.setMinimumWidth(160);
 
         prompt.getPromptListeners().add(this);
 

Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java?rev=1004804&r1=1004803&r2=1004804&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java Tue Oct  5 20:19:08 2010
@@ -329,7 +329,10 @@ public class TerraSheetSkin extends Wind
         resizeHandle.setSize(resizeHandle.getPreferredSize());
         resizeHandle.setLocation(width - resizeHandle.getWidth() - 2,
             height - resizeHandle.getHeight() - 2);
-        resizeHandle.setVisible(resizable);
+        resizeHandle.setVisible(resizable
+            && !sheet.isMaximized()
+            && (sheet.isPreferredWidthSet()
+                || sheet.isPreferredHeightSet()));
 
         Component content = sheet.getContent();
         if (content != null) {