You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/11/06 19:23:23 UTC
svn commit: r833508 - in
/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer:
ComponentExplorer.java ComponentExplorer.json component_explorer.wtkx
Author: tvolkert
Date: Fri Nov 6 18:23:23 2009
New Revision: 833508
URL: http://svn.apache.org/viewvc?rev=833508&view=rev
Log:
Added ScrollBarPolicy.ALWAYS support in the component explorer
Modified:
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer/ComponentExplorer.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer/ComponentExplorer.json
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer/component_explorer.wtkx
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer/ComponentExplorer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer/ComponentExplorer.java?rev=833508&r1=833507&r2=833508&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer/ComponentExplorer.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer/ComponentExplorer.java Fri Nov 6 18:23:23 2009
@@ -68,10 +68,12 @@
private Button horizontalFillButton = null;
private Button horizontalFillToCapacityButton = null;
private Button horizontalNeverButton = null;
+ private Button horizontalAlwaysButton = null;
private Button verticalAutoButton = null;
private Button verticalFillButton = null;
private Button verticalFillToCapacityButton = null;
private Button verticalNeverButton = null;
+ private Button verticalAlwaysButton = null;
public static final String CLASS_PROPERTY = "class";
@@ -96,10 +98,12 @@
horizontalFillButton = wtkxSerializer.getValue("horizontalFillButton");
horizontalFillToCapacityButton = wtkxSerializer.getValue("horizontalFillToCapacityButton");
horizontalNeverButton = wtkxSerializer.getValue("horizontalNeverButton");
+ horizontalAlwaysButton = wtkxSerializer.getValue("horizontalAlwaysButton");
verticalAutoButton = wtkxSerializer.getValue("verticalAutoButton");
verticalFillButton = wtkxSerializer.getValue("verticalFillButton");
verticalFillToCapacityButton = wtkxSerializer.getValue("verticalFillToCapacityButton");
verticalNeverButton = wtkxSerializer.getValue("verticalNeverButton");
+ verticalAlwaysButton = wtkxSerializer.getValue("verticalAlwaysButton");
treeView.getTreeViewSelectionListeners().add(new TreeViewSelectionListener.Adapter() {
@Override
@@ -153,6 +157,9 @@
case NEVER:
horizontalScrollBarPolicyGroup.setSelection(horizontalNeverButton);
break;
+ case ALWAYS:
+ horizontalScrollBarPolicyGroup.setSelection(horizontalAlwaysButton);
+ break;
}
switch (componentNode.getVerticalScrollBarPolicy()) {
@@ -168,6 +175,9 @@
case NEVER:
verticalScrollBarPolicyGroup.setSelection(verticalNeverButton);
break;
+ case ALWAYS:
+ verticalScrollBarPolicyGroup.setSelection(verticalAlwaysButton);
+ break;
}
} else {
sourceTextArea.setText(null);
@@ -218,6 +228,8 @@
horizontalScrollBarPolicy = ScrollBarPolicy.FILL_TO_CAPACITY;
} else if (button == horizontalNeverButton) {
horizontalScrollBarPolicy = ScrollBarPolicy.NEVER;
+ } else if (button == horizontalAlwaysButton) {
+ horizontalScrollBarPolicy = ScrollBarPolicy.ALWAYS;
}
if (horizontalScrollBarPolicy != null) {
@@ -242,6 +254,8 @@
verticalScrollBarPolicy = ScrollBarPolicy.FILL_TO_CAPACITY;
} else if (button == verticalNeverButton) {
verticalScrollBarPolicy = ScrollBarPolicy.NEVER;
+ } else if (button == verticalAlwaysButton) {
+ verticalScrollBarPolicy = ScrollBarPolicy.ALWAYS;
}
if (verticalScrollBarPolicy != null) {
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer/ComponentExplorer.json
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer/ComponentExplorer.json?rev=833508&r1=833507&r2=833508&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer/ComponentExplorer.json (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer/ComponentExplorer.json Fri Nov 6 18:23:23 2009
@@ -34,7 +34,8 @@
auto: "Auto",
fill: "Fill",
fillToCapacity: "Fill To Capacity",
- never: "Never"
+ never: "Never",
+ always: "Always"
}
},
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer/component_explorer.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer/component_explorer.wtkx?rev=833508&r1=833507&r2=833508&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer/component_explorer.wtkx (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/explorer/component_explorer.wtkx Fri Nov 6 18:23:23 2009
@@ -419,6 +419,10 @@
toggleButton="true"
buttonGroup="$horizontalScrollBarPolicyGroup"
buttonData="%contentPane.scrollBarPolicy.never"/>
+ <Menu.Item wtkx:id="horizontalAlwaysButton"
+ toggleButton="true"
+ buttonGroup="$horizontalScrollBarPolicyGroup"
+ buttonData="%contentPane.scrollBarPolicy.always"/>
</Menu.Section>
</sections>
</Menu>
@@ -445,6 +449,10 @@
toggleButton="true"
buttonGroup="$verticalScrollBarPolicyGroup"
buttonData="%contentPane.scrollBarPolicy.never"/>
+ <Menu.Item wtkx:id="verticalAlwaysButton"
+ toggleButton="true"
+ buttonGroup="$verticalScrollBarPolicyGroup"
+ buttonData="%contentPane.scrollBarPolicy.always"/>
</Menu.Section>
</sections>
</Menu>