-
-
Notifications
You must be signed in to change notification settings - Fork 278
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #117 from DavidSpriggs/feature/FloatingWidgets
Feature/floating TitlePane widgets
- Loading branch information
Showing
7 changed files
with
161 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| define([ | ||
| 'dojo/_base/declare', | ||
| 'dijit/TitlePane', | ||
| 'dijit/_Contained', | ||
| 'dojo/on', | ||
| 'dojo/_base/lang', | ||
| 'dojo/dnd/Moveable', | ||
| 'dojo/aspect', | ||
| 'dojo/_base/window', | ||
| 'dojo/window', | ||
| 'dojo/dom-geometry', | ||
| 'dojo/dom-style', | ||
| 'dojo/dom-construct', | ||
| 'dojo/dom-attr', | ||
| 'dojo/dom-class', | ||
| 'xstyle/css!./FloatingTitlePane/css/FloatingTitlePane.css' | ||
| ], function(declare, TitlePane, _Contained, on, lang, Moveable, aspect, win, winUtils, domGeom, domStyle, domConstruct, domAttr, domClass, css) { | ||
| return declare([TitlePane, _Contained], { | ||
| postCreate: function() { | ||
| if (this.canFloat) { | ||
| this.dockHandleNode = domConstruct.create('span', { | ||
| title: 'Dock widget' | ||
| }, this.titleNode, 'after'); | ||
| domStyle.set(this.dockHandleNode, 'display', 'none'); | ||
| domClass.add(this.dockHandleNode, 'floatingWidgetDock'); | ||
|
|
||
| this.moveHandleNode = domConstruct.create('span', { | ||
| title: 'Move widget' | ||
| }, this.titleNode, 'after'); | ||
| domClass.add(this.moveHandleNode, 'floatingWidgetPopout'); | ||
|
|
||
| on(this.moveHandleNode, 'click', lang.hitch(this, function(evt) { | ||
| this._undockWidget(); | ||
| evt.stopImmediatePropagation(); | ||
| })); | ||
| on(this.dockHandleNode, 'click', lang.hitch(this, function(evt) { | ||
| this._dockWidget(); | ||
| evt.stopImmediatePropagation(); | ||
| })); | ||
| } | ||
| this.inherited(arguments); | ||
| }, | ||
| startup: function() { | ||
| this.index = this.getIndexInParent(); | ||
| if (this.titleBarNode && this.canFloat) { | ||
| this._moveable = new Moveable(this.domNode, { | ||
| handle: this.moveHandleNode | ||
| }); | ||
| aspect.after(this._moveable, 'onMoveStop', lang.hitch(this, '_endDrag'), true); | ||
| aspect.after(this._moveable, 'onFirstMove', lang.hitch(this, '_moveDom'), true); | ||
| } | ||
| this.inherited(arguments); | ||
| }, | ||
| _undockWidget: function() { | ||
| if (!this.isFloating) { | ||
| domClass.add(this.moveHandleNode, 'floatingWidgetMove'); | ||
| domClass.remove(this.moveHandleNode, 'floatingWidgetPopout'); | ||
| } | ||
| }, | ||
| _dockWidget: function() { | ||
| domAttr.remove(this.domNode, 'style'); | ||
| domStyle.set(this.dockHandleNode, 'display', 'none'); | ||
| var dockedWidgets = this.sidebar.getChildren(); | ||
| this.placeAt(this.sidebar, dockedWidgets.length); | ||
| domClass.remove(this.moveHandleNode, 'floatingWidgetMove'); | ||
| domClass.add(this.moveHandleNode, 'floatingWidgetPopout'); | ||
| this.isFloating = false; | ||
| }, | ||
| _moveDom: function() { | ||
| if (!this.isFloating) { | ||
| domStyle.set(this.dockHandleNode, 'display', 'inline'); | ||
| domStyle.set(this.domNode, 'z-index', '40'); | ||
| domClass.add(this.moveHandleNode, 'floatingWidgetMove'); | ||
| domClass.remove(this.moveHandleNode, 'floatingWidgetPopout'); | ||
| var computedStyle = domStyle.getComputedStyle(this.containerNode); | ||
| var width = parseInt(domStyle.getComputedStyle(this.sidebar.containerNode).width, 10); | ||
| domGeom.setContentSize(this.containerNode, { | ||
| w: (width - 32) | ||
| }, computedStyle); | ||
| domGeom.setContentSize(this.titleBarNode, { | ||
| w: (width - 32) | ||
| }, computedStyle); | ||
| this.isFloating = true; | ||
| this.placeAt(win.body()); | ||
| } | ||
| }, | ||
| _endDrag: function() { | ||
| // summary: | ||
| // Called after dragging the Dialog. Saves the position of the dialog in the viewport, | ||
| // and also adjust position to be fully within the viewport, so user doesn't lose access to handle | ||
| var nodePosition = domGeom.position(this.domNode); | ||
| var viewport = winUtils.getBox(this.ownerDocument); | ||
| nodePosition.y = Math.min(Math.max(nodePosition.y, 0), (viewport.h - nodePosition.h)); | ||
| nodePosition.x = Math.min(Math.max(nodePosition.x, 0), (viewport.w - nodePosition.w)); | ||
| this._relativePosition = nodePosition; | ||
| this._position(); | ||
| }, | ||
| _position: function() { | ||
| // summary: | ||
| // Position the dialog in the viewport. If no relative offset | ||
| // in the viewport has been determined (by dragging, for instance), | ||
| // center the dialog. Otherwise, use the Dialog's stored relative offset, | ||
| // adjusted by the viewport's scroll. | ||
| if (!domClass.contains(this.ownerDocumentBody, 'dojoMove')) { // don't do anything if called during auto-scroll | ||
| var node = this.domNode, | ||
| viewport = winUtils.getBox(this.ownerDocument), | ||
| p = this._relativePosition, | ||
| bb = p ? null : domGeom.position(node), | ||
| l = Math.floor(viewport.l + (p ? p.x : (viewport.w - bb.w) / 2)), | ||
| t = Math.floor(viewport.t + (p ? p.y : (viewport.h - bb.h) / 2)); | ||
| domStyle.set(node, { | ||
| left: l + 'px', | ||
| top: t + 'px' | ||
| }); | ||
| } | ||
| } | ||
| }); | ||
| }); |
16 changes: 16 additions & 0 deletions
16
viewer/js/gis/dijit/FloatingTitlePane/css/FloatingTitlePane.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| .floatingWidgetMove:before { | ||
| float: right; | ||
| margin-left: 10px; | ||
| content: "\f047"; | ||
| font-family: FontAwesome; | ||
| } | ||
| .floatingWidgetDock:before { | ||
| float: right; | ||
| content: "\f112"; | ||
| font-family: FontAwesome; | ||
| } | ||
| .floatingWidgetPopout:before { | ||
| float: right; | ||
| content: "\f064"; | ||
| font-family: FontAwesome; | ||
| } |
File renamed without changes.
Oops, something went wrong.