You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gc...@apache.org on 2008/11/13 22:08:34 UTC
svn commit: r713824 - in
/myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src:
main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/
Author: gcrawford
Date: Thu Nov 13 13:08:34 2008
New Revision: 713824
URL: http://svn.apache.org/viewvc?rev=713824&view=rev
Log:
TRINIDAD-1263 In Mobile devices - PanelHorizontalLayout has text overlap
apply patch from Tadashi, thanks Tadashi!
Modified:
myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHorizontalLayoutRenderer.java
myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelHorizontalLayout-minimalPPC-golden.xml
myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelHorizontalLayout-separator-minimalPPC-golden.xml
Modified: myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHorizontalLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHorizontalLayoutRenderer.java?rev=713824&r1=713823&r2=713824&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHorizontalLayoutRenderer.java (original)
+++ myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHorizontalLayoutRenderer.java Thu Nov 13 13:08:34 2008
@@ -119,9 +119,14 @@
boolean needSeparator = false;
boolean isFirstChild = true;
-
+ /**
+ * To fix the overlapping of the separator with first child,
+ * ignore endAligment(<td width = 100%>) in PDA
+ */
boolean isEndAlignment;
- if (CorePanelHorizontalLayout.HALIGN_END.equals(hAlign))
+ if (isPDA(arc))
+ isEndAlignment = false;
+ else if (CorePanelHorizontalLayout.HALIGN_END.equals(hAlign))
isEndAlignment = true;
else if (CorePanelHorizontalLayout.HALIGN_LEFT.equals(hAlign))
isEndAlignment = arc.isRightToLeft();
Modified: myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelHorizontalLayout-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelHorizontalLayout-minimalPPC-golden.xml?rev=713824&r1=713823&r2=713824&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelHorizontalLayout-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelHorizontalLayout-minimalPPC-golden.xml Thu Nov 13 13:08:34 2008
@@ -522,11 +522,6 @@
>
<td
- width="100%"
- >
-
- </td>
- <td
>
1
</td>
@@ -608,11 +603,6 @@
>
<td
- width="100%"
- >
-
- </td>
- <td
>
1
</td>
Modified: myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelHorizontalLayout-separator-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelHorizontalLayout-separator-minimalPPC-golden.xml?rev=713824&r1=713823&r2=713824&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelHorizontalLayout-separator-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelHorizontalLayout-separator-minimalPPC-golden.xml Thu Nov 13 13:08:34 2008
@@ -854,11 +854,6 @@
>
<td
- width="100%"
- >
-
- </td>
- <td
>
1
</td>
@@ -994,11 +989,6 @@
>
<td
- width="100%"
- >
-
- </td>
- <td
>
1
</td>