Update of /cvsroot/qooxdoo/qooxdoo/source/script/widgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23080/source/script/widgets
Modified Files:
Tag: renderer
QxButton.js QxComboBox.js QxCommonViewButton.js QxGallery.js
QxGalleryList.js QxIconHtml.js QxImage.js
QxListViewContentCellImage.js QxListViewHeader.js
QxListViewHeaderCell.js QxListViewPane.js QxMenu.js
QxMenuCheckBox.js QxRepeatButton.js QxSpinner.js
QxToolBarCheckBox.js QxToolBarMenuButton.js
QxToolBarRadioButton.js QxTree.js QxTreeElement.js QxWindow.js
Log Message:
Reimplemented state handling, fixed some issues with blank images
Index: QxListViewHeader.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxListViewHeader.js,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -d -r1.1.2.17 -r1.1.2.18
--- QxListViewHeader.js 18 Jan 2006 10:00:12 -0000 1.1.2.17
+++ QxListViewHeader.js 2 Feb 2006 16:51:04 -0000 1.1.2.18
@@ -243,7 +243,7 @@
this.getTopLevelWidget().setGlobalCursor(null);
// Remove hover effect
- this._resizeTarget.setMouseState(QxConst.STATE_OUT);
+ this._resizeTarget.removeState(QxConst.STATE_OVER);
// Hide resize line
this.getParent().getResizeLine().setStyleProperty(QxConst.PROPERTY_VISIBILITY, QxConst.CORE_HIDDEN);
Index: QxButton.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxButton.js,v
retrieving revision 1.4.2.34
retrieving revision 1.4.2.35
diff -u -d -r1.4.2.34 -r1.4.2.35
--- QxButton.js 24 Jan 2006 16:48:55 -0000 1.4.2.34
+++ QxButton.js 2 Feb 2006 16:51:04 -0000 1.4.2.35
@@ -77,11 +77,13 @@
return;
};
- if (this.hasState(QxConst.STATE_LEFT)) {
- this.setButtonState(QxConst.STATE_PRESSED);
+ if (this.hasState(QxConst.STATE_LEFT))
+ {
+ this.removeState(QxConst.STATE_LEFT);
+ this.addState(QxConst.STATE_PRESSED);
};
- this.setMouseState(QxConst.STATE_OVER);
+ this.addState(QxConst.STATE_OVER);
};
proto._onmouseout = function(e)
@@ -90,7 +92,7 @@
return;
};
- this.setMouseState(QxConst.STATE_OUT);
+ this.removeState(QxConst.STATE_OVER);
if (this.hasState(QxConst.STATE_PRESSED))
{
@@ -98,7 +100,8 @@
// the button is pressed.
this.setCapture(true);
- this.setButtonState(QxConst.STATE_LEFT);
+ this.removeState(QxConst.STATE_PRESSED);
+ this.addState(QxConst.STATE_LEFT);
};
};
@@ -108,7 +111,8 @@
return;
};
- this.setButtonState(QxConst.STATE_PRESSED);
+ this.removeState(QxConst.STATE_LEFT);
+ this.addState(QxConst.STATE_PRESSED);
};
proto._onmouseup = function(e)
@@ -117,14 +121,15 @@
if (!this.hasState(QxConst.STATE_LEFT))
{
- this.setMouseState(QxConst.STATE_OVER);
+ this.addState(QxConst.STATE_OVER);
if (this.hasState(QxConst.STATE_PRESSED)) {
this.execute();
};
};
- this.setButtonState(QxConst.STATE_NOTPRESSED);
+ this.removeState(QxConst.STATE_LEFT);
+ this.removeState(QxConst.STATE_PRESSED);
};
proto._onkeydown = function(e)
@@ -133,7 +138,8 @@
{
case QxKeyEvent.keys.enter:
case QxKeyEvent.keys.space:
- this.setButtonState(QxConst.STATE_PRESSED);
+ this.removeState(QxConst.STATE_LEFT);
+ this.addState(QxConst.STATE_PRESSED);
};
};
@@ -145,7 +151,8 @@
case QxKeyEvent.keys.space:
if (this.hasState(QxConst.STATE_PRESSED))
{
- this.setButtonState(QxConst.STATE_NOTPRESSED);
+ this.removeState(QxConst.STATE_LEFT);
+ this.removeState(QxConst.STATE_PRESSED);
this.execute();
};
};
Index: QxListViewPane.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxListViewPane.js,v
retrieving revision 1.1.2.34
retrieving revision 1.1.2.35
diff -u -d -r1.1.2.34 -r1.1.2.35
--- QxListViewPane.js 16 Jan 2006 16:11:57 -0000 1.1.2.34
+++ QxListViewPane.js 2 Feb 2006 16:51:04 -0000 1.1.2.35
@@ -227,7 +227,7 @@
if (vChild)
{
- vChild.setSelectedState(vEntry && vEntry._selected ? QxConst.STATE_SELECTED : QxConst.STATE_NOTSELECTED);
+ vEntry && vEntry._selected ? vChild.addState(QxConst.STATE_SELECTED) : vChild.removeState(QxConst.STATE_SELECTED);
vChild.set(vEntry ? vEntry[vCol] : vColumns[vCol].empty || vColumns[vCol].contentClass.empty);
};
};
Index: QxSpinner.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxSpinner.js,v
retrieving revision 1.9.2.29
retrieving revision 1.9.2.30
diff -u -d -r1.9.2.29 -r1.9.2.30
--- QxSpinner.js 28 Jan 2006 18:19:24 -0000 1.9.2.29
+++ QxSpinner.js 2 Feb 2006 16:51:04 -0000 1.9.2.30
@@ -330,7 +330,7 @@
var vButton = e.getCurrentTarget();
- vButton.setButtonState(QxConst.STATE_PRESSED);
+ vButton.addState(QxConst.STATE_PRESSED);
vButton.addEventListener(QxConst.EVENT_TYPE_MOUSEUP, this._onmouseup, this);
vButton.addEventListener(QxConst.EVENT_TYPE_MOUSEOUT, this._onmouseup, this);
@@ -349,7 +349,7 @@
{
var vButton = e.getCurrentTarget();
- vButton.setButtonState(QxConst.STATE_NOTPRESSED);
+ vButton.removeState(QxConst.STATE_PRESSED);
vButton.removeEventListener(QxConst.EVENT_TYPE_MOUSEUP, this._onmouseup, this);
vButton.removeEventListener(QxConst.EVENT_TYPE_MOUSEOUT, this._onmouseup, this);
@@ -388,7 +388,7 @@
if (vValue == this.getMin())
{
- this._downbutton.setButtonState(QxConst.STATE_NOTPRESSED);
+ this._downbutton.removeState(QxConst.STATE_PRESSED);
this._downbutton.setEnabled(false);
this._timer.stop();
}
@@ -399,7 +399,7 @@
if (vValue == this.getMax())
{
- this._upbutton.setButtonState(QxConst.STATE_NOTPRESSED);
+ this._upbutton.removeState(QxConst.STATE_PRESSED);
this._upbutton.setEnabled(false);
this._timer.stop();
}
Index: QxTree.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxTree.js,v
retrieving revision 1.2.2.34
retrieving revision 1.2.2.35
diff -u -d -r1.2.2.34 -r1.2.2.35
--- QxTree.js 16 Jan 2006 16:11:57 -0000 1.2.2.34
+++ QxTree.js 2 Feb 2006 16:51:04 -0000 1.2.2.35
@@ -323,7 +323,7 @@
var vOldItem = this._oldItem;
var vNewItem = this.getManager().getSelectedItem();
- vNewItem.getIconObject().setSelectedState(QxConst.STATE_SELECTED);
+ vNewItem.getIconObject().addState(QxConst.STATE_SELECTED);
delete this._fastUpdate;
delete this._oldItem;
Index: QxRepeatButton.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxRepeatButton.js,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- QxRepeatButton.js 16 Jan 2006 16:11:57 -0000 1.1.2.8
+++ QxRepeatButton.js 2 Feb 2006 16:51:04 -0000 1.1.2.9
@@ -71,7 +71,8 @@
this._timer.setInterval(this.getFirstInterval());
this._timer.start();
- this.setButtonState(QxConst.STATE_PRESSED);
+ this.removeState(QxConst.STATE_LEFT);
+ this.addState(QxConst.STATE_PRESSED);
};
proto._onmouseup = function(e)
@@ -80,7 +81,7 @@
if (!this.hasState(QxConst.STATE_LEFT))
{
- this.setMouseState(QxConst.STATE_OVER);
+ this.addState(QxConst.STATE_OVER);
if (this.hasState(QxConst.STATE_PRESSED) && !this._executed) {
this.execute();
@@ -89,7 +90,8 @@
this._timer.stop();
- this.setButtonState(QxConst.STATE_NOTPRESSED);
+ this.removeState(QxConst.STATE_LEFT);
+ this.removeState(QxConst.STATE_PRESSED);
};
proto._oninterval = function(e)
Index: QxGallery.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxGallery.js,v
retrieving revision 1.21.2.11
retrieving revision 1.21.2.12
diff -u -d -r1.21.2.11 -r1.21.2.12
--- QxGallery.js 28 Jan 2006 18:19:24 -0000 1.21.2.11
+++ QxGallery.js 2 Feb 2006 16:51:04 -0000 1.21.2.12
@@ -34,7 +34,7 @@
{
QxTerminator.call(this);
- this._blank = QxImageManager.getBlank();
+ this._blank = QxImageManager.buildURI(QxImageManager.getBlank());
this._list = vGalleryList;
this._listSize = vGalleryList.length;
this._processedImages = 0;
Index: QxTreeElement.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxTreeElement.js,v
retrieving revision 1.3.2.47
retrieving revision 1.3.2.48
diff -u -d -r1.3.2.47 -r1.3.2.48
--- QxTreeElement.js 18 Jan 2006 22:10:15 -0000 1.3.2.47
+++ QxTreeElement.js 2 Feb 2006 16:51:04 -0000 1.3.2.48
@@ -122,17 +122,14 @@
proto._modifySelected = function(propValue, propOldValue, propData)
{
- var vState = propValue ? QxConst.STATE_SELECTED : QxConst.STATE_NOTSELECTED;
-
- this.setSelectedState(vState);
-
+ propValue ? this.addState(QxConst.STATE_SELECTED) : this.removeState(QxConst.STATE_SELECTED);
+ propValue ? this._labelObject.addState(QxConst.STATE_SELECTED) : this._labelObject.removeState(QxConst.STATE_SELECTED);
+
var vTree = this.getTree();
if (!vTree._fastUpdate || (propOldValue && vTree._oldItem == this)) {
- this._iconObject.setSelectedState(vState);
+ propValue ? this._iconObject.addState(QxConst.STATE_SELECTED) : this._iconObject.removeState(QxConst.STATE_SELECTED);
};
- this._labelObject.setSelectedState(vState);
-
var vManager = this.getTree().getManager();
if (propOldValue && vManager.getSelectedItem() == this)
Index: QxWindow.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxWindow.js,v
retrieving revision 1.25.2.64
retrieving revision 1.25.2.65
diff -u -d -r1.25.2.64 -r1.25.2.65
--- QxWindow.js 19 Jan 2006 12:31:34 -0000 1.25.2.64
+++ QxWindow.js 2 Feb 2006 16:51:04 -0000 1.25.2.65
@@ -515,8 +515,8 @@
QxWindowManager.setActiveWindow(null);
};
- this.setActiveState(QxConst.STATE_INACTIVE);
- this._captionBar.setActiveState(QxConst.STATE_INACTIVE);
+ this.removeState(QxConst.STATE_ACTIVE);
+ this._captionBar.removeState(QxConst.STATE_ACTIVE);
}
else
{
@@ -530,8 +530,8 @@
QxWindowManager.setActiveWindow(this);
this.bringToFront();
- this.setActiveState(QxConst.STATE_ACTIVE);
- this._captionBar.setActiveState(QxConst.STATE_ACTIVE);
+ this.addState(QxConst.STATE_ACTIVE);
+ this._captionBar.addState(QxConst.STATE_ACTIVE);
};
return true;
@@ -764,7 +764,7 @@
this.setBottom(this._previousBottom ? this._previousBottom : null);
// update state
- this.setWindowState(QxConst.STATE_RESTORED);
+ this.removeState(QxConst.STATE_MAXIMIZED);
// toggle button
if (this.getShowMaximize())
@@ -805,7 +805,7 @@
this.setBottom(0);
// update state
- this.setWindowState(QxConst.STATE_MAXIMIZED);
+ this.addState(QxConst.STATE_MAXIMIZED);
// toggle button
if (this.getShowMaximize())
@@ -1131,8 +1131,9 @@
// we need to be sure that the button gets the right states after clicking
// because the button will move and does not get the mouseup event anymore
- this._minimizeButton.setButtonState(QxConst.STATE_NOTPRESSED);
- this._minimizeButton.setMouseState(QxConst.STATE_OUT);
+ this._minimizeButton.removeState(QxConst.STATE_PRESSED);
+ this._minimizeButton.removeState(QxConst.STATE_LEFT);
+ this._minimizeButton.removeState(QxConst.STATE_OVER);
e.stopPropagation();
};
@@ -1143,8 +1144,9 @@
// we need to be sure that the button gets the right states after clicking
// because the button will move and does not get the mouseup event anymore
- this._restoreButton.setButtonState(QxConst.STATE_NOTPRESSED);
- this._restoreButton.setMouseState(QxConst.STATE_OUT);
+ this._restoreButton.removeState(QxConst.STATE_PRESSED);
+ this._restoreButton.removeState(QxConst.STATE_LEFT);
+ this._restoreButton.removeState(QxConst.STATE_OVER);
e.stopPropagation();
};
@@ -1155,9 +1157,10 @@
// we need to be sure that the button gets the right states after clicking
// because the button will move and does not get the mouseup event anymore
- this._maximizeButton.setButtonState(QxConst.STATE_NOTPRESSED);
- this._maximizeButton.setMouseState(QxConst.STATE_OUT);
-
+ this._maximizeButton.removeState(QxConst.STATE_PRESSED);
+ this._maximizeButton.removeState(QxConst.STATE_LEFT);
+ this._maximizeButton.removeState(QxConst.STATE_OVER);
+
e.stopPropagation();
};
@@ -1167,8 +1170,9 @@
// we need to be sure that the button gets the right states after clicking
// because the button will move and does not get the mouseup event anymore
- this._closeButton.setButtonState(QxConst.STATE_NOTPRESSED);
- this._closeButton.setMouseState(QxConst.STATE_OUT);
+ this._closeButton.removeState(QxConst.STATE_PRESSED);
+ this._closeButton.removeState(QxConst.STATE_LEFT);
+ this._closeButton.removeState(QxConst.STATE_OVER);
e.stopPropagation();
};
Index: QxListViewContentCellImage.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxListViewContentCellImage.js,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -d -r1.1.2.11 -r1.1.2.12
--- QxListViewContentCellImage.js 30 Jan 2006 11:33:33 -0000 1.1.2.11
+++ QxListViewContentCellImage.js 2 Feb 2006 16:51:04 -0000 1.1.2.12
@@ -53,7 +53,7 @@
{
if (this._initialLayoutDone)
{
- return this._updateContent(vSource == QxConst.CORE_EMPTY ? QxImageManager.getBlank() : QxImageManager.buildURI(vSource));
+ return this._updateContent(QxImageManager.buildURI(vSource == QxConst.CORE_EMPTY ? QxImageManager.getBlank() : vSource));
}
else
{
Index: QxCommonViewButton.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxCommonViewButton.js,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- QxCommonViewButton.js 23 Jan 2006 15:17:13 -0000 1.1.2.7
+++ QxCommonViewButton.js 2 Feb 2006 16:51:04 -0000 1.1.2.8
@@ -158,7 +158,7 @@
};
};
- this.setCheckedState(propValue ? QxConst.STATE_CHECKED : QxConst.STATE_UNCHECKED);
+ propValue ? this.addState(QxConst.STATE_CHECKED) : this.removeState(QxConst.STATE_CHECKED);
var vPage = this.getPage();
if (vPage) {
@@ -194,11 +194,11 @@
};
proto._onmouseover = function(e) {
- this.setMouseState(QxConst.STATE_OVER);
+ this.addState(QxConst.STATE_OVER);
};
proto._onmouseout = function(e) {
- this.setMouseState(QxConst.STATE_OUT);
+ this.removeState(QxConst.STATE_OVER);
};
proto._onkeydown = function(e) {};
Index: QxIconHtml.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxIconHtml.js,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- QxIconHtml.js 16 Jan 2006 16:11:57 -0000 1.1.2.5
+++ QxIconHtml.js 2 Feb 2006 16:51:04 -0000 1.1.2.6
@@ -106,7 +106,7 @@
var vHtml = [];
vHtml.push(QxIconHtml.START_IMAGE);
- vHtml.push(this._mshtml ? QxImageManager.getBlank() : QxImageManager.buildURI(this.getIcon()));
+ vHtml.push(QxImageManager.buildURI(this._mshtml ? QxImageManager.getBlank() : this.getIcon()));
vHtml.push(QxIconHtml.START_STYLE);
if (QxUtil.isValidNumber(this.getSpacing()))
Index: QxMenuCheckBox.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxMenuCheckBox.js,v
retrieving revision 1.7.2.18
retrieving revision 1.7.2.19
diff -u -d -r1.7.2.18 -r1.7.2.19
--- QxMenuCheckBox.js 16 Jan 2006 16:11:57 -0000 1.7.2.18
+++ QxMenuCheckBox.js 2 Feb 2006 16:51:04 -0000 1.7.2.19
@@ -70,10 +70,16 @@
proto._modifyChecked = function(propValue, propOldValue, propData)
{
- var vState = propValue ? QxConst.STATE_CHECKED : QxConst.STATE_UNCHECKED;
-
- this.setCheckedState(vState);
- this.getIconObject().setCheckedState(vState);
+ if (propValue)
+ {
+ this.addState(QxConst.STATE_CHECKED);
+ this.getIconObject().addState(QxConst.STATE_CHECKED);
+ }
+ else
+ {
+ this.removeState(QxConst.STATE_CHECKED);
+ this.getIconObject().removeState(QxConst.STATE_CHECKED);
+ };
return true;
};
Index: QxToolBarRadioButton.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxToolBarRadioButton.js,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -d -r1.1.2.18 -r1.1.2.19
--- QxToolBarRadioButton.js 23 Jan 2006 15:17:13 -0000 1.1.2.18
+++ QxToolBarRadioButton.js 2 Feb 2006 16:51:04 -0000 1.1.2.19
@@ -113,12 +113,13 @@
if (!this.hasState(QxConst.STATE_LEFT))
{
- this.setMouseState(QxConst.STATE_OVER);
+ this.addState(QxConst.STATE_OVER);
this.setChecked(this.getDisableUncheck() || !this.getChecked());
this.execute();
};
- this.setButtonState(QxConst.STATE_NOTPRESSED);
+ this.removeState(QxConst.STATE_LEFT);
+ this.removeState(QxConst.STATE_PRESSED);
e.stopPropagation();
};
Index: QxComboBox.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxComboBox.js,v
retrieving revision 1.9.2.40
retrieving revision 1.9.2.41
diff -u -d -r1.9.2.40 -r1.9.2.41
--- QxComboBox.js 31 Jan 2006 16:37:35 -0000 1.9.2.40
+++ QxComboBox.js 2 Feb 2006 16:51:04 -0000 1.9.2.41
@@ -308,7 +308,7 @@
// no break here
case this._button:
- this._button.setButtonState(QxConst.STATE_PRESSED);
+ this._button.addState(QxConst.STATE_PRESSED);
this._togglePopup();
break;
@@ -344,7 +344,7 @@
// no break here
case this._button:
- this._button.setButtonState(QxConst.STATE_NOTPRESSED);
+ this._button.removeState(QxConst.STATE_NOTPRESSED);
break;
};
};
Index: QxToolBarMenuButton.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxToolBarMenuButton.js,v
retrieving revision 1.2.2.25
retrieving revision 1.2.2.26
diff -u -d -r1.2.2.25 -r1.2.2.26
--- QxToolBarMenuButton.js 16 Jan 2006 16:11:57 -0000 1.2.2.25
+++ QxToolBarMenuButton.js 2 Feb 2006 16:51:04 -0000 1.2.2.26
@@ -84,7 +84,7 @@
if (vMenu)
{
- this.setButtonState(QxConst.STATE_PRESSED);
+ this.addState(QxConst.STATE_PRESSED);
var el = this.getElement();
@@ -169,7 +169,7 @@
return;
};
- this.setMouseState(QxConst.STATE_OUT);
+ this.removeState(QxConst.STATE_OVER);
};
proto._onmouseover = function(e)
Index: QxImage.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxImage.js,v
retrieving revision 1.8.2.86
retrieving revision 1.8.2.87
diff -u -d -r1.8.2.86 -r1.8.2.87
--- QxImage.js 30 Jan 2006 13:36:27 -0000 1.8.2.86
+++ QxImage.js 2 Feb 2006 16:51:04 -0000 1.8.2.87
@@ -246,7 +246,7 @@
// this costs much performance, move setup to blank gif to error handling
// is this SSL save?
- // this._image.src = QxImageManager.getBlank();
+ // this._image.src = QxImageManager.buildURI(QxImageManager.getBlank());
this._image.style.border = QxImage.BORDER_NONE;
this._image.style.verticalAlign = QxImage.RESET_VALIGN;
@@ -316,7 +316,7 @@
if (pl.getIsPng() && this.getEnabled())
{
- i.src = QxImageManager.getBlank();
+ i.src = QxImageManager.buildURI(QxImageManager.getBlank());
i.style.filter = QxImage.IMGLOADER_START + (vSource || pl.getSource()) + QxImage.IMGLOADER_STOP;
}
else
@@ -330,7 +330,7 @@
{
var i = this._image;
- i.src = QxImageManager.getBlank();
+ i.src = QxImageManager.buildURI(QxImageManager.getBlank());
i.style.filter = QxConst.CORE_EMPTY;
};
@@ -353,7 +353,7 @@
};
proto._resetContent = function() {
- this._image.src = QxImageManager.getBlank();
+ this._image.src = QxImageManager.buildURI(QxImageManager.getBlank());
};
proto._applyEnabled = function()
Index: QxMenu.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxMenu.js,v
retrieving revision 1.17.2.36
retrieving revision 1.17.2.37
diff -u -d -r1.17.2.36 -r1.17.2.37
--- QxMenu.js 17 Jan 2006 13:47:13 -0000 1.17.2.36
+++ QxMenu.js 2 Feb 2006 16:51:04 -0000 1.17.2.37
@@ -162,7 +162,7 @@
// be sure that the opener button gets the correct state
var vOpener = this.getOpener();
if (vOpener) {
- vOpener.setButtonState(QxConst.STATE_NOTPRESSED);
+ vOpener.removeState(QxConst.STATE_PRESSED);
};
};
@@ -180,11 +180,11 @@
proto._modifyHoverItem = function(propValue, propOldValue, propData)
{
if (propOldValue) {
- propOldValue.setMouseState(QxConst.STATE_OUT);
+ propOldValue.removeState(QxConst.STATE_OVER);
};
if (propValue) {
- propValue.setMouseState(QxConst.STATE_OVER);
+ propValue.addState(QxConst.STATE_OVER);
};
return true;
Index: QxGalleryList.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxGalleryList.js,v
retrieving revision 1.7.2.9
retrieving revision 1.7.2.10
diff -u -d -r1.7.2.9 -r1.7.2.10
--- QxGalleryList.js 25 Jan 2006 14:14:07 -0000 1.7.2.9
+++ QxGalleryList.js 2 Feb 2006 16:51:04 -0000 1.7.2.10
@@ -34,7 +34,7 @@
{
QxTerminator.call(this);
- this._blank = QxImageManager.getBlank();
+ this._blank = QxImageManager.buildURI(QxImageManager.getBlank());
this._list = galleryList;
this._listSize = galleryList.length;
this._processedImages = 0;
Index: QxToolBarCheckBox.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/QxToolBarCheckBox.js,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -d -r1.1.2.15 -r1.1.2.16
--- QxToolBarCheckBox.js 16 Jan 2006 16:11:57 -0000 1.1.2.15
+++ QxToolBarCheckBox.js 2 Feb 2006 16:51:04 -0000 1.1.2.16
@@ -62,7 +62,7 @@
proto._modifyChecked = function(propValue, propOldValue, propData)
{
- this.setCheckedState(propValue ? QxConst.STATE_CHECKED : QxConst.STATE_UNCHECKED);
+ propValue ? this.addState(QxConst.STATE_CHECKED) : this.removeState(QxConst.STATE_CHECKED);
return true;
};
@@ -82,12 +82,13 @@
if (!this.hasState(QxConst.STATE_LEFT))
{
- this.setMouseState(QxConst.STATE_OVER);
+ this.addState(QxConst.STATE_OVER);
this.setChecked(!this.getChecked());
this.execute();
};
- this.setButtonState(QxConst.STATE_NOTPRESSED);
+ this.removeState(QxConst.STATE_LEFT);
+ this.removeState(QxConst.STATE_PRESSED);
e.stopPropagation();
};
Index: QxListViewHeaderCell.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/widgets/Attic/QxListViewHeaderCell.js,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -d -r1.1.2.17 -r1.1.2.18
--- QxListViewHeaderCell.js 16 Jan 2006 16:11:57 -0000 1.1.2.17
+++ QxListViewHeaderCell.js 2 Feb 2006 16:51:04 -0000 1.1.2.18
@@ -198,11 +198,11 @@
*/
proto._onmouseover = function(e) {
- this.setMouseState(QxConst.STATE_OVER);
+ this.addState(QxConst.STATE_OVER);
};
proto._onmouseout = function(e) {
- this.setMouseState(QxConst.STATE_OUT);
+ this.removeState(QxConst.STATE_OVER);
};
proto._onmouseup = function(e)
|