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 2009/08/19 00:15:27 UTC
svn commit: r805603 - in /incubator/pivot/trunk/wtk:
src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
test/org/apache/pivot/wtk/test/FileBrowserSheetTest.java
Author: gbrown
Date: Tue Aug 18 22:15:27 2009
New Revision: 805603
URL: http://svn.apache.org/viewvc?rev=805603&view=rev
Log:
Minor bug fixes.
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserSheetTest.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java?rev=805603&r1=805602&r2=805603&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java Tue Aug 18 22:15:27 2009
@@ -107,6 +107,9 @@
}
});
+ fileBrowser.getStyles().put("keyboardFolderTraversalEnabled",
+ (mode != FileBrowserSheet.Mode.SAVE_TO));
+
fileBrowser.getFileBrowserListeners().add(new FileBrowserListener.Adapter() {
public void selectedFileAdded(FileBrowser fileBrowser, File file) {
if (file.isDirectory()) {
@@ -302,7 +305,7 @@
}
case SAVE_TO: {
- okButton.setEnabled(selectedFiles.getLength() > 0);
+ okButton.setEnabled(selectedDirectoryCount > 0);
break;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java?rev=805603&r1=805602&r2=805603&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java Tue Aug 18 22:15:27 2009
@@ -510,7 +510,7 @@
int contentX = clientX + padding.left;
int contentY = clientY + padding.top;
int contentWidth = Math.max(clientWidth - (padding.left + padding.right), 0);
- int contentHeight = Math.max(clientHeight - (clientY + padding.top + padding.bottom), 0);
+ int contentHeight = Math.max(clientHeight - (clientY + padding.top + padding.bottom) + 1, 0);
content.setLocation(contentX, contentY);
content.setSize(contentWidth, contentHeight);
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserSheetTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserSheetTest.java?rev=805603&r1=805602&r2=805603&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserSheetTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserSheetTest.java Tue Aug 18 22:15:27 2009
@@ -31,7 +31,7 @@
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
- FileBrowserSheet fileOpenSheet = new FileBrowserSheet(FileBrowserSheet.Mode.OPEN);
+ FileBrowserSheet fileOpenSheet = new FileBrowserSheet(FileBrowserSheet.Mode.SAVE_TO);
wtkxSerializer.put("fileOpenSheet", fileOpenSheet);
frame = (Frame)wtkxSerializer.readObject(getClass().getResource("file_browser_sheet_test.wtkx"));