Skip to content

Commit 8e182b4

Browse files
coderespawncoderespawn
committed
Fixed merge conflict
2 parents db48bfe + b8f3348 commit 8e182b4

19 files changed

+88
-87
lines changed

‎AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# Dock Spawn Authors
22

33
Ali Akbar <[email protected]>
4+
Marius Volkhart <[email protected]>

‎lib/containers/fill_dock_container.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ class FillDockContainer implements IDockContainer {
5555
}
5656

5757

58-
int get width => element.clientWidth;
58+
int get width => element.client.width;
5959
set width(int value) => element.style.width = "${value}px";
6060

61-
int get height => element.clientHeight;
61+
int get height => element.client.height;
6262
set height(int value) => element.style.height = "${value}px";
6363

6464
}

‎lib/containers/panel_dock_container.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ class PanelContainer implements IDockContainer {
9090
elementContentHost.classes.add("panel-content");
9191

9292
// set the size of the dialog elements based on the panel's size
93-
int panelWidth = elementContent.clientWidth;
94-
int panelHeight = elementContent.clientHeight;
95-
int titleHeight = elementTitle.clientHeight;
93+
int panelWidth = elementContent.client.width;
94+
int panelHeight = elementContent.client.height;
95+
int titleHeight = elementTitle.client.height;
9696
_setPanelDimensions(panelWidth, panelHeight + titleHeight);
9797

9898
// Add the panel to the body
@@ -179,7 +179,7 @@ class PanelContainer implements IDockContainer {
179179
elementPanel.style.width = "${_width}px";
180180

181181

182-
int titleBarHeight = elementTitle.clientHeight;
182+
int titleBarHeight = elementTitle.client.height;
183183
int contentHeight = _height - titleBarHeight;
184184
elementContentHost.style.height = "${contentHeight}px";
185185
elementContent.style.height = "${contentHeight}px";

‎lib/containers/splitter_dock_container.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ abstract class SplitterDockContainer implements IDockContainer {
6363

6464
int get width {
6565
if (_cachedWidth == null) {
66-
_cachedWidth = splitterPanel.panelElement.clientWidth;
66+
_cachedWidth = splitterPanel.panelElement.client.width;
6767
}
6868
return _cachedWidth;
6969
// return splitterPanel.panelElement.clientWidth;
7070
}
7171

7272
int get height {
7373
if (_cachedHeight == null) {
74-
_cachedHeight = splitterPanel.panelElement.clientHeight;
74+
_cachedHeight = splitterPanel.panelElement.client.height;
7575
}
7676
return _cachedHeight; //splitterPanel.panelElement.clientHeight;
7777
// return splitterPanel.panelElement.clientHeight;

‎lib/decorators/draggable_container.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class DraggableContainer implements IDockContainer {
2121
containerType = delegate.containerType;
2222

2323
mouseDownHandler = dragHandle.onMouseDown.listen(onMouseDown);
24-
topLevelElement.style.marginLeft = "${topLevelElement.offsetLeft}";
25-
topLevelElement.style.marginTop = "${topLevelElement.offsetTop}";
24+
topLevelElement.style.marginLeft = "${topLevelElement.offset.left}";
25+
topLevelElement.style.marginTop = "${topLevelElement.offset.top}";
2626
}
2727

2828
void destroy() {
@@ -76,7 +76,7 @@ class DraggableContainer implements IDockContainer {
7676

7777
void onMouseDown(MouseEvent event) {
7878
_startDragging(event);
79-
previousMousePosition = new Point2(event.pageX, event.pageY);
79+
previousMousePosition = new Point2(event.page.x, event.page.y);
8080
if (mouseMoveHandler != null) {
8181
mouseMoveHandler.cancel();
8282
mouseMoveHandler = null;
@@ -114,7 +114,7 @@ class DraggableContainer implements IDockContainer {
114114
}
115115

116116
void onMouseMove(MouseEvent event) {
117-
Point2 currentMousePosition = new Point2(event.pageX, event.pageY);
117+
Point2 currentMousePosition = new Point2(event.page.x, event.page.y);
118118
int dx = (currentMousePosition.x - previousMousePosition.x).toInt();
119119
int dy = (currentMousePosition.y - previousMousePosition.y).toInt();
120120
_performDrag(dx, dy);

‎lib/decorators/resizable_container.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ class ResizableContainer implements IDockContainer {
1818

1919
ResizableContainer(this.dialog, this.delegate, this.topLevelElement) {
2020
containerType = delegate.containerType;
21-
topLevelElement.style.marginLeft = "${topLevelElement.offsetLeft}";
22-
topLevelElement.style.marginTop = "${topLevelElement.offsetTop}";
21+
topLevelElement.style.marginLeft = "${topLevelElement.offset.left}";
22+
topLevelElement.style.marginTop = "${topLevelElement.offset.top}";
2323
_buildResizeHandles();
2424
}
2525

@@ -143,7 +143,7 @@ class ResizableContainer implements IDockContainer {
143143

144144
// window.requestLayoutFrame(() {
145145
dockManager.suspendLayout();
146-
Point2 currentMousePosition = new Point2(e.pageX, e.pageY);
146+
Point2 currentMousePosition = new Point2(e.page.x, e.page.y);
147147
int dx = (currentMousePosition.x - previousMousePosition.x).toInt();
148148
int dy = (currentMousePosition.y - previousMousePosition.y).toInt();
149149
_performDrag(handle, dx, dy);
@@ -154,7 +154,7 @@ class ResizableContainer implements IDockContainer {
154154
}
155155

156156
void onMouseDown(ResizeHandle handle, MouseEvent event) {
157-
previousMousePosition = new Point2(event.pageX, event.pageY);
157+
previousMousePosition = new Point2(event.page.x, event.page.y);
158158
if (handle.mouseMoveHandlerSub != null) {
159159
handle.mouseMoveHandlerSub.cancel();
160160
}
@@ -181,8 +181,8 @@ class ResizableContainer implements IDockContainer {
181181
var bounds = new BoundingBox();
182182
bounds.left = getPixels(topLevelElement.style.marginLeft);
183183
bounds.top = getPixels(topLevelElement.style.marginTop);
184-
bounds.width = topLevelElement.clientWidth;
185-
bounds.height = topLevelElement.clientHeight;
184+
bounds.width = topLevelElement.client.width;
185+
bounds.height = topLevelElement.client.height;
186186

187187
if (handle.east) _resizeEast(dx, bounds);
188188
if (handle.west) _resizeWest(dx, bounds);

‎lib/dialog/dialog.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class Dialog {
3434
panel.elementTitle.classes.add("rounded-corner-top");
3535

3636
mouseDownHandler = elementDialog.onMouseDown.listen(onMouseDown);
37-
resize(panel.elementPanel.clientWidth, panel.elementPanel.clientHeight);
37+
resize(panel.elementPanel.client.width, panel.elementPanel.client.height);
3838
bringToFront();
3939
}
4040

‎lib/dock/dock_layout_engine.dart‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ class DockLayoutEngine {
116116
DockNode referenceParent = referenceNode.parent;
117117

118118
// Get the dimensions of the reference node, for resizing later on
119-
int referenceNodeWidth = referenceNode.container.containerElement.clientWidth;
120-
int referenceNodeHeight = referenceNode.container.containerElement.clientHeight;
119+
int referenceNodeWidth = referenceNode.container.containerElement.client.width;
120+
int referenceNodeHeight = referenceNode.container.containerElement.client.height;
121121

122122
// Get the dimensions of the reference node, for resizing later on
123-
int referenceNodeParentWidth = referenceParent.container.containerElement.clientWidth;
124-
int referenceNodeParentHeight = referenceParent.container.containerElement.clientHeight;
123+
int referenceNodeParentWidth = referenceParent.container.containerElement.client.width;
124+
int referenceNodeParentHeight = referenceParent.container.containerElement.client.height;
125125

126126
// Replace the reference node with a new composite node with the reference and new node as it's children
127127
IDockContainer compositeContainer = _createDockContainer(direction, newNode, referenceNode);
@@ -159,14 +159,14 @@ class DockLayoutEngine {
159159
}
160160

161161
// force resize the panel
162-
int containerWidth = newNode.container.containerElement.clientWidth;
163-
int containerHeight = newNode.container.containerElement.clientHeight;
162+
int containerWidth = newNode.container.containerElement.client.width;
163+
int containerHeight = newNode.container.containerElement.client.height;
164164
newNode.container.resize(containerWidth, containerHeight);
165165
}
166166

167167
void _forceResizeCompositeContainer(IDockContainer container) {
168-
int width = container.containerElement.clientWidth;
169-
int height = container.containerElement.clientHeight;
168+
int width = container.containerElement.client.width;
169+
int height = container.containerElement.client.height;
170170
container.resize(width, height);
171171
}
172172

@@ -200,10 +200,10 @@ class DockLayoutEngine {
200200
// TODO: Create a tab handle highlight to show that it's going to be docked in a tab
201201
Element targetElement = referenceNode.container.containerElement;
202202
Rectangle bounds = new Rectangle();
203-
bounds.x = targetElement.offsetLeft;
204-
bounds.y = targetElement.offsetTop;
205-
bounds.width = targetElement.clientWidth;
206-
bounds.height= targetElement.clientHeight;
203+
bounds.x = targetElement.offset.left;
204+
bounds.y = targetElement.offset.top;
205+
bounds.width = targetElement.client.width;
206+
bounds.height= targetElement.client.height;
207207
return bounds;
208208
}
209209

@@ -255,13 +255,13 @@ class DockLayoutEngine {
255255

256256
Rectangle bounds = new Rectangle();
257257
if (direction == "vertical") {
258-
bounds.x = compositeNode.container.containerElement.offsetLeft;
259-
bounds.y = compositeNode.container.containerElement.offsetTop + targetPanelStart;
258+
bounds.x = compositeNode.container.containerElement.offset.left;
259+
bounds.y = compositeNode.container.containerElement.offset.top + targetPanelStart;
260260
bounds.width = compositeNode.container.width;
261261
bounds.height = targetPanelSize;
262262
} else if (direction == "horizontal") {
263-
bounds.x = compositeNode.container.containerElement.offsetLeft + targetPanelStart;
264-
bounds.y = compositeNode.container.containerElement.offsetTop;
263+
bounds.x = compositeNode.container.containerElement.offset.left + targetPanelStart;
264+
bounds.y = compositeNode.container.containerElement.offset.top;
265265
bounds.width = targetPanelSize;
266266
bounds.height = compositeNode.container.height;
267267
}

‎lib/dock/dock_manager.dart‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class DockManager implements DialogEventListener {
2727
context.model.documentManagerNode = documentNode;
2828
setRootNode(context.model.rootNode);
2929
// Resize the layout
30-
resize(element.clientWidth, element.clientHeight);
30+
resize(element.client.width, element.client.height);
3131
dockWheel = new DockWheel(this);
3232
layoutEngine = new DockLayoutEngine(this);
3333

@@ -40,7 +40,7 @@ class DockManager implements DialogEventListener {
4040
}
4141

4242
void invalidate() {
43-
resize(element.clientWidth, element.clientHeight);
43+
resize(element.client.width, element.client.height);
4444
}
4545

4646
void resize(int width, int height) {
@@ -75,7 +75,7 @@ class DockManager implements DialogEventListener {
7575

7676

7777
void onDialogDragStarted(Dialog sender, MouseEvent e) {
78-
dockWheel.activeNode = _findNodeOnPoint(e.pageX, e.pageY);
78+
dockWheel.activeNode = _findNodeOnPoint(e.page.x, e.page.y);
7979
dockWheel.activeDialog = sender;
8080
dockWheel.showWheel();
8181
if (mouseMoveHandler != null) {
@@ -95,7 +95,7 @@ class DockManager implements DialogEventListener {
9595
}
9696

9797
void onMouseMoved(MouseEvent e) {
98-
dockWheel.activeNode = _findNodeOnPoint(e.pageX, e.pageY);
98+
dockWheel.activeNode = _findNodeOnPoint(e.page.x, e.page.y);
9999
}
100100

101101
/**
@@ -218,13 +218,13 @@ class DockManager implements DialogEventListener {
218218
var dialog = new Dialog(node.container, this);
219219

220220
// Adjust the relative position
221-
num dialogWidth = dialog.elementDialog.clientWidth;
221+
num dialogWidth = dialog.elementDialog.client.width;
222222
if (dragOffset.x > dialogWidth) {
223223
dragOffset.x = 0.75 * dialogWidth;
224224
}
225225
dialog.setPosition(
226-
event.pageX - dragOffset.x,
227-
event.pageY - dragOffset.y);
226+
event.page.x - dragOffset.x,
227+
event.page.y - dragOffset.y);
228228
dialog.draggable.onMouseDown(event);
229229

230230
return dialog;

‎lib/dock/dock_model.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ class DockNode {
5959
childNode.parent = this;
6060

6161
int referenceIndex = children.indexOf(referenceNode);
62-
List<DockNode> preList = children.getRange(0, referenceIndex);
63-
List<DockNode> postList = children.getRange(referenceIndex + 1, children.length - (referenceIndex + 1));
62+
List<DockNode> preList = children.sublist(0, referenceIndex);
63+
List<DockNode> postList = children.sublist(referenceIndex + 1, children.length);
6464

6565
children = new List<DockNode>();
6666
children.addAll(preList);

0 commit comments

Comments
 (0)