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/18 15:54:49 UTC
svn commit: r805414 - in
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk: ./ skin/terra/
Author: gbrown
Date: Tue Aug 18 13:54:48 2009
New Revision: 805414
URL: http://svn.apache.org/viewvc?rev=805414&view=rev
Log:
Rename "itemFilter" to "disabledItemFilter" in FileBrowser and FileBrowserSheet; fix "mouse pointer is not over capturer" bug.
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserListener.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheetListener.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java?rev=805414&r1=805413&r2=805414&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java Tue Aug 18 13:54:48 2009
@@ -711,6 +711,11 @@
// Propagate event to subcomponents
if (component != null) {
+ // Ensure that mouse over is called
+ if (!component.isMouseOver()) {
+ component.mouseOver();
+ }
+
consumed = component.mouseDown(button, x - component.getX(),
y - component.getY());
}
@@ -738,6 +743,11 @@
Component component = getComponentAt(x, y);
if (component != null) {
+ // Ensure that mouse over is called
+ if (!component.isMouseOver()) {
+ component.mouseOver();
+ }
+
consumed = component.mouseUp(button, x - component.getX(),
y - component.getY());
}
@@ -788,6 +798,11 @@
Component component = getComponentAt(x, y);
if (component != null) {
+ // Ensure that mouse over is called
+ if (!component.isMouseOver()) {
+ component.mouseOver();
+ }
+
consumed = component.mouseWheel(scrollType, scrollAmount, wheelRotation,
x - component.getX(), y - component.getY());
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java?rev=805414&r1=805413&r2=805414&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java Tue Aug 18 13:54:48 2009
@@ -56,15 +56,17 @@
}
}
- public void selectedFilesChanged(FileBrowser fileBrowser, Sequence<File> previousSelectedFiles) {
+ public void selectedFilesChanged(FileBrowser fileBrowser,
+ Sequence<File> previousSelectedFiles) {
for (FileBrowserListener listener : this) {
listener.selectedFilesChanged(fileBrowser, previousSelectedFiles);
}
}
- public void fileFilterChanged(FileBrowser fileBrowser, Filter<File> previousFileFilter) {
+ public void disabledFileFilterChanged(FileBrowser fileBrowser,
+ Filter<File> previousDisabledFileFilter) {
for (FileBrowserListener listener : this) {
- listener.fileFilterChanged(fileBrowser, previousFileFilter);
+ listener.disabledFileFilterChanged(fileBrowser, previousDisabledFileFilter);
}
}
}
@@ -72,7 +74,7 @@
private Folder selectedFolder;
private FileList fileSelection = new FileList();
private boolean multiSelect = false;
- private Filter<File> fileFilter = null;
+ private Filter<File> disabledFileFilter = null;
private FileBrowserListenerList fileBrowserListeners = new FileBrowserListenerList();
@@ -264,8 +266,8 @@
* @return
* The current file filter, or <tt>null</tt> if no filter is set.
*/
- public Filter<File> getFileFilter() {
- return fileFilter;
+ public Filter<File> getDisabledFileFilter() {
+ return disabledFileFilter;
}
/**
@@ -274,12 +276,12 @@
* @param fileFilter
* The file filter to use, or <tt>null</tt> for no filter.
*/
- public void setFileFilter(Filter<File> fileFilter) {
- Filter<File> previousFileFilter = this.fileFilter;
+ public void setDisabledFileFilter(Filter<File> disabledFileFilter) {
+ Filter<File> previousDisabledFileFilter = this.disabledFileFilter;
- if (previousFileFilter != fileFilter) {
- this.fileFilter = fileFilter;
- fileBrowserListeners.fileFilterChanged(this, previousFileFilter);
+ if (previousDisabledFileFilter != disabledFileFilter) {
+ this.disabledFileFilter = disabledFileFilter;
+ fileBrowserListeners.disabledFileFilterChanged(this, previousDisabledFileFilter);
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserListener.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserListener.java?rev=805414&r1=805413&r2=805414&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserListener.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserListener.java Tue Aug 18 13:54:48 2009
@@ -33,7 +33,8 @@
public void multiSelectChanged(FileBrowser fileBrowser) {
}
- public void selectedFolderChanged(FileBrowser fileBrowser, Folder previousSelectedFolder) {
+ public void selectedFolderChanged(FileBrowser fileBrowser,
+ Folder previousSelectedFolder) {
}
public void selectedFileAdded(FileBrowser fileBrowser, File file) {
@@ -42,10 +43,12 @@
public void selectedFileRemoved(FileBrowser fileBrowser, File file) {
}
- public void selectedFilesChanged(FileBrowser fileBrowser, Sequence<File> previousSelectedFiles) {
+ public void selectedFilesChanged(FileBrowser fileBrowser,
+ Sequence<File> previousSelectedFiles) {
}
- public void fileFilterChanged(FileBrowser fileBrowser, Filter<File> previousFileFilter) {
+ public void disabledFileFilterChanged(FileBrowser fileBrowser,
+ Filter<File> previousDisabledFileFilter) {
}
}
@@ -86,13 +89,15 @@
* @param fileBrowser
* @param previousSelectedFiles
*/
- public void selectedFilesChanged(FileBrowser fileBrowser, Sequence<File> previousSelectedFiles);
+ public void selectedFilesChanged(FileBrowser fileBrowser,
+ Sequence<File> previousSelectedFiles);
/**
* Called when a file browser's file filter has changed.
*
* @param fileBrowser
- * @param previousFileFilter
+ * @param previousDisabledFileFilter
*/
- public void fileFilterChanged(FileBrowser fileBrowser, Filter<File> previousFileFilter);
+ public void disabledFileFilterChanged(FileBrowser fileBrowser,
+ Filter<File> previousDisabledFileFilter);
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java?rev=805414&r1=805413&r2=805414&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java Tue Aug 18 13:54:48 2009
@@ -60,9 +60,10 @@
}
}
- public void fileFilterChanged(FileBrowserSheet fileBrowserSheet, Filter<File> previousFileFilter) {
+ public void disabledFileFilterChanged(FileBrowserSheet fileBrowserSheet,
+ Filter<File> previousDisabledFileFilter) {
for (FileBrowserSheetListener listener : this) {
- listener.fileFilterChanged(fileBrowserSheet, previousFileFilter);
+ listener.disabledFileFilterChanged(fileBrowserSheet, previousDisabledFileFilter);
}
}
}
@@ -71,7 +72,7 @@
private Folder selectedFolder;
private FileList fileSelection = new FileList();
private boolean multiSelect = false;
- private Filter<File> fileFilter = null;
+ private Filter<File> disabledFileFilter = null;
private FileBrowserSheetListenerList fileBrowserSheetListeners = new FileBrowserSheetListenerList();
@@ -210,16 +211,16 @@
}
}
- public Filter<File> getFileFilter() {
- return fileFilter;
+ public Filter<File> getDisabledFileFilter() {
+ return disabledFileFilter;
}
- public void setFileFilter(Filter<File> fileFilter) {
- Filter<File> previousFileFilter = this.fileFilter;
+ public void setDisabledFileFilter(Filter<File> disabledFileFilter) {
+ Filter<File> previousDisabledFileFilter = this.disabledFileFilter;
- if (previousFileFilter != fileFilter) {
- this.fileFilter = fileFilter;
- fileBrowserSheetListeners.fileFilterChanged(this, previousFileFilter);
+ if (previousDisabledFileFilter != disabledFileFilter) {
+ this.disabledFileFilter = disabledFileFilter;
+ fileBrowserSheetListeners.disabledFileFilterChanged(this, previousDisabledFileFilter);
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheetListener.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheetListener.java?rev=805414&r1=805413&r2=805414&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheetListener.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheetListener.java Tue Aug 18 13:54:48 2009
@@ -33,13 +33,16 @@
public void multiSelectChanged(FileBrowserSheet fileBrowserSheet) {
}
- public void selectedFolderChanged(FileBrowserSheet fileBrowserSheet, Folder previousSelectedFolder) {
+ public void selectedFolderChanged(FileBrowserSheet fileBrowserSheet,
+ Folder previousSelectedFolder) {
}
- public void selectedFilesChanged(FileBrowserSheet fileBrowserSheet, Sequence<File> previousSelectedFiles) {
+ public void selectedFilesChanged(FileBrowserSheet fileBrowserSheet,
+ Sequence<File> previousSelectedFiles) {
}
- public void fileFilterChanged(FileBrowserSheet fileBrowserSheet, Filter<File> previousFileFilter) {
+ public void disabledFileFilterChanged(FileBrowserSheet fileBrowserSheet,
+ Filter<File> previousDisabledFileFilter) {
}
}
@@ -56,7 +59,8 @@
* @param fileBrowserSheet
* @param previousSelectedFolder
*/
- public void selectedFolderChanged(FileBrowserSheet fileBrowserSheet, Folder previousSelectedFolder);
+ public void selectedFolderChanged(FileBrowserSheet fileBrowserSheet,
+ Folder previousSelectedFolder);
/**
* Called when a file browser sheet's selection state has been reset.
@@ -64,13 +68,15 @@
* @param fileBrowserSheet
* @param previousSelectedFiles
*/
- public void selectedFilesChanged(FileBrowserSheet fileBrowserSheet, Sequence<File> previousSelectedFiles);
+ public void selectedFilesChanged(FileBrowserSheet fileBrowserSheet,
+ Sequence<File> previousSelectedFiles);
/**
- * Called when a file browser sheet's file filter has changed.
+ * Called when a file browser sheet's disabled file filter has changed.
*
* @param fileBrowserSheet
- * @param previousFileFilter
+ * @param previousDisabledFileFilter
*/
- public void fileFilterChanged(FileBrowserSheet fileBrowserSheet, Filter<File> previousFileFilter);
+ public void disabledFileFilterChanged(FileBrowserSheet fileBrowserSheet,
+ Filter<File> previousDisabledFileFilter);
}
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=805414&r1=805413&r2=805414&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 13:54:48 2009
@@ -124,7 +124,7 @@
}
}
- public void fileFilterChanged(FileBrowserSheet fileBrowserSheet, Filter<File> previousFileFilter) {
+ public void disabledFileFilterChanged(FileBrowserSheet fileBrowserSheet, Filter<File> previousFileFilter) {
// TODO
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java?rev=805414&r1=805413&r2=805414&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java Tue Aug 18 13:54:48 2009
@@ -492,8 +492,8 @@
}
}
- public void fileFilterChanged(FileBrowser fileBrowser, Filter<File> previousFileFilter) {
- fileTableView.setDisabledRowFilter(fileBrowser.getFileFilter());
+ public void disabledFileFilterChanged(FileBrowser fileBrowser, Filter<File> previousFileFilter) {
+ fileTableView.setDisabledRowFilter(fileBrowser.getDisabledFileFilter());
}
public static File getRelativeFile(Folder folder, File file) {