details: /erp/devel/pi/rev/086febdcfa84
changeset: 11632:086febdcfa84
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Apr 21 10:46:36 2011 +0200
summary: Upped smartclient module version for latest nightly build
details: /erp/devel/pi/rev/a5500d39d9f5
changeset: 11633:a5500d39d9f5
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Apr 21 10:48:00 2011 +0200
summary: Fixes issue 16307: row in edit mode renders one pixel off the mark
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 23 ++++++---
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
| 20 +++++---
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
3 files changed, 31 insertions(+), 16 deletions(-)
diffs (155 lines):
diff -r 1abf8032d82a -r a5500d39d9f5
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Thu Apr 21 09:23:27 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Thu Apr 21 10:48:00 2011 +0200
@@ -32,7 +32,7 @@
// The OBViewGrid is the Openbravo specific subclass of the Smartclient
// ListGrid.
isc.OBViewGrid.addProperties({
-
+
// ** {{{ view }}} **
// The view member contains the pointer to the composite canvas which
// handles this form
@@ -100,7 +100,6 @@
canOpenRecordEditor: true,
showDetailFields: true,
showErrorIcons: false,
- virtualScrolling: true,
// internal sc grid property, see the ListGrid source code
preserveEditsOnSetData: false,
@@ -120,10 +119,10 @@
// commented out because of: https://issues.openbravo.com/view.php?id=16515
// default is much smaller which give smoother scrolling
// quickDrawAheadRatio: 1.0,
-// drawAheadRatio: 2.0,
+ //drawAheadRatio: 2.0,
// see this discussion:
// http://forums.smartclient.com/showthread.php?t=16376
- scrollRedrawDelay: 0,
+ //scrollRedrawDelay: 20,
// note: don't set drawAllMaxCells too high as it results in extra reads
// of data, Smartclient will try to read until drawAllMaxCells has been
// reached
@@ -136,9 +135,9 @@
// editing props
rowEndEditAction: 'next',
listEndEditAction: 'next',
- // disabled as it costs performance, but need to recheck
- // if rows are drawn with multiple lines
+
enforceVClipping: true,
+
canDragSelectText: true,
validateByCell: true,
@@ -1881,7 +1880,18 @@
}
return this.Super('getRecord', arguments);
},
+
+ // always work with fixed rowheights
+ // https://issues.openbravo.com/view.php?id=16307
+ shouldFixRowHeight: function() {
+ return true;
+ },
+ // needed for: https://issues.openbravo.com/view.php?id=16307
+ getRowHeight: function() {
+ return this.cellHeight;
+ },
+
// +++++++++++++++++ functions for the edit-link column +++++++++++++++++
createRecordComponent: function(record, colNum){
@@ -1970,7 +1980,6 @@
isc.OBGridButtonsComponent.addProperties({
OBGridToolStrip: null,
saveCancelLayout: null,
- height: 22,
// the grid to which this component belongs
grid: null,
diff -r 1abf8032d82a -r a5500d39d9f5
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
Thu Apr 21 09:23:27 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
Thu Apr 21 10:48:00 2011 +0200
@@ -61,11 +61,11 @@
getDefaultColumnWidth: function(length) {
if (length <= 1) {
- return isc.OBViewGrid.defaultColumnWidths[0];
+ return isc.OBGrid.defaultColumnWidths[0];
} else if (length <= 30) {
- return isc.OBViewGrid.defaultColumnWidths[1];
+ return isc.OBGrid.defaultColumnWidths[1];
} else if (length <= 60) {
- return isc.OBViewGrid.defaultColumnWidths[2];
+ return isc.OBGrid.defaultColumnWidths[2];
}
return 200;
}
@@ -93,6 +93,12 @@
src:
'[SKIN]/../../org.openbravo.client.application/images/grid/gridHeader_bg.png'
});
+isc.OBViewGrid.addProperties({
+ // note should be the same as the height of the OBGridButtonsComponent
+ recordComponentHeight: 21,
+ cellHeight: 25
+});
+
isc.OBGrid.changeDefaults('headerMenuButtonDefaults', {
showDown: false,
showTitle: true,
@@ -100,7 +106,6 @@
//src:
'[SKIN]/../../org.openbravo.client.application/images/grid/gridHeader_bg.png'
});
-
// Styling properties for the header button of a generic grid (ob-grid.js)
isc.OBGridHeaderImgButton.addProperties({
showFocused: false,
@@ -109,7 +114,6 @@
showDown: false
});
-
// Styling properties for the buttons of the grid in 'grid mode'
(ob-view-grid.js)
isc.OBGridToolStripIcon.addProperties({
width: 21,
@@ -141,10 +145,12 @@
});
isc.OBGridButtonsComponent.addProperties({
- height: 1,
+ // note this height should be the same as the recordComponentHeight defined
above
+ height: 21,
width: '100%',
- visible: 'overflow',
+ overflow: 'hidden',
align: 'center',
+ defaultLayoutAlign: 'center',
styleName: 'OBGridToolStrip',
membersMargin: 4
});
diff -r 1abf8032d82a -r a5500d39d9f5
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
Thu Apr 21 09:23:27 2011 +0200
+++
b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
Thu Apr 21 10:48:00 2011 +0200
@@ -6,7 +6,7 @@
<!--EC356CEE3D46416CA1EBEEB9AB82EDB9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--EC356CEE3D46416CA1EBEEB9AB82EDB9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--EC356CEE3D46416CA1EBEEB9AB82EDB9--> <NAME><![CDATA[Smartclient]]></NAME>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->
<VERSION><![CDATA[8.1.11591]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->
<VERSION><![CDATA[8.1.11628]]></VERSION>
<!--EC356CEE3D46416CA1EBEEB9AB82EDB9--> <DESCRIPTION><![CDATA[Smartclient
libraries for use within Openbravo]]></DESCRIPTION>
<!--EC356CEE3D46416CA1EBEEB9AB82EDB9--> <HELP><![CDATA[This module contains
the Smartclient libraries for usage by other modules. It also contains some
simple test pages to validate that Smartclient is working correctly. Also
contains generic Openbravo Smartclient components]]></HELP>
<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->
<URL><![CDATA[http://forge.openbravo.com/projects/obsmartclient]]></URL>
@@ -23,7 +23,7 @@
<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->
<HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
<!--EC356CEE3D46416CA1EBEEB9AB82EDB9--> <UPDATEINFO><![CDATA[Bug fixing & new
development for 3.0
Update to new smartclient 8.0]]></UPDATEINFO>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->
<VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9--> <VERSION_LABEL><![CDATA[CI
]]></VERSION_LABEL>
<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->
<ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--EC356CEE3D46416CA1EBEEB9AB82EDB9--></AD_MODULE>
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
