| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * | 10 * |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 | 568 |
| 569 /** | 569 /** |
| 570 * @param {number} sidebarSize | 570 * @param {number} sidebarSize |
| 571 * @param {boolean=} userAction | 571 * @param {boolean=} userAction |
| 572 * @return {number} | 572 * @return {number} |
| 573 */ | 573 */ |
| 574 _applyConstraints(sidebarSize, userAction) { | 574 _applyConstraints(sidebarSize, userAction) { |
| 575 var totalSize = this._totalSizeDIP(); | 575 var totalSize = this._totalSizeDIP(); |
| 576 var zoomFactor = this._constraintsInDip ? 1 : UI.zoomManager.zoomFactor(); | 576 var zoomFactor = this._constraintsInDip ? 1 : UI.zoomManager.zoomFactor(); |
| 577 | 577 |
| 578 var constraints = this._sidebarWidget ? this._sidebarWidget.constraints() :
new Constraints(); | 578 var constraints = this._sidebarWidget ? this._sidebarWidget.constraints() :
new UI.Constraints(); |
| 579 var minSidebarSize = this.isVertical() ? constraints.minimum.width : constra
ints.minimum.height; | 579 var minSidebarSize = this.isVertical() ? constraints.minimum.width : constra
ints.minimum.height; |
| 580 if (!minSidebarSize) | 580 if (!minSidebarSize) |
| 581 minSidebarSize = UI.SplitWidget.MinPadding; | 581 minSidebarSize = UI.SplitWidget.MinPadding; |
| 582 minSidebarSize *= zoomFactor; | 582 minSidebarSize *= zoomFactor; |
| 583 if (this._sidebarMinimized) | 583 if (this._sidebarMinimized) |
| 584 sidebarSize = minSidebarSize; | 584 sidebarSize = minSidebarSize; |
| 585 | 585 |
| 586 var preferredSidebarSize = this.isVertical() ? constraints.preferred.width :
constraints.preferred.height; | 586 var preferredSidebarSize = this.isVertical() ? constraints.preferred.width :
constraints.preferred.height; |
| 587 if (!preferredSidebarSize) | 587 if (!preferredSidebarSize) |
| 588 preferredSidebarSize = UI.SplitWidget.MinPadding; | 588 preferredSidebarSize = UI.SplitWidget.MinPadding; |
| 589 preferredSidebarSize *= zoomFactor; | 589 preferredSidebarSize *= zoomFactor; |
| 590 // Allow sidebar to be less than preferred by explicit user action. | 590 // Allow sidebar to be less than preferred by explicit user action. |
| 591 if (sidebarSize < preferredSidebarSize) | 591 if (sidebarSize < preferredSidebarSize) |
| 592 preferredSidebarSize = Math.max(sidebarSize, minSidebarSize); | 592 preferredSidebarSize = Math.max(sidebarSize, minSidebarSize); |
| 593 preferredSidebarSize += zoomFactor; // 1 css pixel for splitter border. | 593 preferredSidebarSize += zoomFactor; // 1 css pixel for splitter border. |
| 594 | 594 |
| 595 constraints = this._mainWidget ? this._mainWidget.constraints() : new Constr
aints(); | 595 constraints = this._mainWidget ? this._mainWidget.constraints() : new UI.Con
straints(); |
| 596 var minMainSize = this.isVertical() ? constraints.minimum.width : constraint
s.minimum.height; | 596 var minMainSize = this.isVertical() ? constraints.minimum.width : constraint
s.minimum.height; |
| 597 if (!minMainSize) | 597 if (!minMainSize) |
| 598 minMainSize = UI.SplitWidget.MinPadding; | 598 minMainSize = UI.SplitWidget.MinPadding; |
| 599 minMainSize *= zoomFactor; | 599 minMainSize *= zoomFactor; |
| 600 | 600 |
| 601 var preferredMainSize = this.isVertical() ? constraints.preferred.width : co
nstraints.preferred.height; | 601 var preferredMainSize = this.isVertical() ? constraints.preferred.width : co
nstraints.preferred.height; |
| 602 if (!preferredMainSize) | 602 if (!preferredMainSize) |
| 603 preferredMainSize = UI.SplitWidget.MinPadding; | 603 preferredMainSize = UI.SplitWidget.MinPadding; |
| 604 preferredMainSize *= zoomFactor; | 604 preferredMainSize *= zoomFactor; |
| 605 var savedMainSize = this.isVertical() ? this._savedVerticalMainSize : this._
savedHorizontalMainSize; | 605 var savedMainSize = this.isVertical() ? this._savedVerticalMainSize : this._
savedHorizontalMainSize; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 | 649 |
| 650 /** | 650 /** |
| 651 * @override | 651 * @override |
| 652 */ | 652 */ |
| 653 onLayout() { | 653 onLayout() { |
| 654 this._updateLayout(); | 654 this._updateLayout(); |
| 655 } | 655 } |
| 656 | 656 |
| 657 /** | 657 /** |
| 658 * @override | 658 * @override |
| 659 * @return {!Constraints} | 659 * @return {!UI.Constraints} |
| 660 */ | 660 */ |
| 661 calculateConstraints() { | 661 calculateConstraints() { |
| 662 if (this._showMode === UI.SplitWidget.ShowMode.OnlyMain) | 662 if (this._showMode === UI.SplitWidget.ShowMode.OnlyMain) |
| 663 return this._mainWidget ? this._mainWidget.constraints() : new Constraints
(); | 663 return this._mainWidget ? this._mainWidget.constraints() : new UI.Constrai
nts(); |
| 664 if (this._showMode === UI.SplitWidget.ShowMode.OnlySidebar) | 664 if (this._showMode === UI.SplitWidget.ShowMode.OnlySidebar) |
| 665 return this._sidebarWidget ? this._sidebarWidget.constraints() : new Const
raints(); | 665 return this._sidebarWidget ? this._sidebarWidget.constraints() : new UI.Co
nstraints(); |
| 666 | 666 |
| 667 var mainConstraints = this._mainWidget ? this._mainWidget.constraints() : ne
w Constraints(); | 667 var mainConstraints = this._mainWidget ? this._mainWidget.constraints() : ne
w UI.Constraints(); |
| 668 var sidebarConstraints = this._sidebarWidget ? this._sidebarWidget.constrain
ts() : new Constraints(); | 668 var sidebarConstraints = this._sidebarWidget ? this._sidebarWidget.constrain
ts() : new UI.Constraints(); |
| 669 var min = UI.SplitWidget.MinPadding; | 669 var min = UI.SplitWidget.MinPadding; |
| 670 if (this._isVertical) { | 670 if (this._isVertical) { |
| 671 mainConstraints = mainConstraints.widthToMax(min).addWidth(1); // 1 for s
plitter | 671 mainConstraints = mainConstraints.widthToMax(min).addWidth(1); // 1 for s
plitter |
| 672 sidebarConstraints = sidebarConstraints.widthToMax(min); | 672 sidebarConstraints = sidebarConstraints.widthToMax(min); |
| 673 return mainConstraints.addWidth(sidebarConstraints).heightToMax(sidebarCon
straints); | 673 return mainConstraints.addWidth(sidebarConstraints).heightToMax(sidebarCon
straints); |
| 674 } else { | 674 } else { |
| 675 mainConstraints = mainConstraints.heightToMax(min).addHeight(1); // 1 for
splitter | 675 mainConstraints = mainConstraints.heightToMax(min).addHeight(1); // 1 for
splitter |
| 676 sidebarConstraints = sidebarConstraints.heightToMax(min); | 676 sidebarConstraints = sidebarConstraints.heightToMax(min); |
| 677 return mainConstraints.widthToMax(sidebarConstraints).addHeight(sidebarCon
straints); | 677 return mainConstraints.widthToMax(sidebarConstraints).addHeight(sidebarCon
straints); |
| 678 } | 678 } |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 881 OnlySidebar: 'OnlySidebar' | 881 OnlySidebar: 'OnlySidebar' |
| 882 }; | 882 }; |
| 883 | 883 |
| 884 /** @enum {symbol} */ | 884 /** @enum {symbol} */ |
| 885 UI.SplitWidget.Events = { | 885 UI.SplitWidget.Events = { |
| 886 SidebarSizeChanged: Symbol('SidebarSizeChanged'), | 886 SidebarSizeChanged: Symbol('SidebarSizeChanged'), |
| 887 ShowModeChanged: Symbol('ShowModeChanged') | 887 ShowModeChanged: Symbol('ShowModeChanged') |
| 888 }; | 888 }; |
| 889 | 889 |
| 890 UI.SplitWidget.MinPadding = 20; | 890 UI.SplitWidget.MinPadding = 20; |
| OLD | NEW |