holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Give default settings based on dynheight in case of missing preference and deferred layout

Browse Source 
- Force layout _before_ setting preference too, or it will render children properly but store a bad size in prefs.
This commit is contained in:
Nathan Gray 2014-02-13 17:05:14 +00:00
parent eeb420a7e7
commit b307202565
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
etemplate/js/et2_widget_split.js
View File

@ -169,7 +169,13 @@ var et2_split = et2_DOMWidget.extend([et2_IResizeable],
dock: this.dock_side, dock: this.dock_side,
splitterClass: "et2_split", splitterClass: "et2_split",
outline: true, outline: true,
eventNamespace: '.et2_split.'+this.id eventNamespace: '.et2_split.'+this.id,
// Default sizes, in case the preference doesn't work
// Splitter would normally just go to 50%, but our deferred loading
// ruins sizing for it
sizeTop: this.dynheight.outerNode.height() / 2,
sizeLeft: this.dynheight.outerNode.width() / 2
}; };
// Check for position preference, load it in // Check for position preference, load it in
@ -221,13 +227,7 @@ var et2_split = et2_DOMWidget.extend([et2_IResizeable],
{ {
var self = this; var self = this;
this.left.on("resize"+options.eventNamespace, function(e) { this.left.on("resize"+options.eventNamespace, function(e) {
if(e.namespace == options.eventNamespace.substr(1) && !self.isDocked())
{
// Store current position in preferences
var size = self.orientation == "v" ? {sizeLeft: self.left.width()} : {sizeTop: self.left.height()};
self.prefSize = size[this.orientation == "v" ?'sizeLeft' : 'sizeTop'];
self.egw().set_preference(self.egw().getAppName(), 'splitter-size-' + self.id, size);
}
// Force immediate layout, so proper layout & sizes are available // Force immediate layout, so proper layout & sizes are available
// for resize(). Chrome defers layout, so current DOM node sizes // for resize(). Chrome defers layout, so current DOM node sizes
// are not available to widgets if they ask. // are not available to widgets if they ask.
@ -235,7 +235,15 @@ var et2_split = et2_DOMWidget.extend([et2_IResizeable],
this.style.display = 'none'; this.style.display = 'none';
this.offsetHeight; this.offsetHeight;
this.style.display = display; this.style.display = display;
if(e.namespace == options.eventNamespace.substr(1) && !self.isDocked())
{
// Store current position in preferences
var size = self.orientation == "v" ? {sizeLeft: self.left.width()} : {sizeTop: self.left.height()};
self.prefSize = size[this.orientation == "v" ?'sizeLeft' : 'sizeTop'];
self.egw().set_preference(self.egw().getAppName(), 'splitter-size-' + self.id, size);
}
// Ok, update children // Ok, update children
self.iterateOver(function(widget) { self.iterateOver(function(widget) {
if(widget != self) if(widget != self)