0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

on drag/resize, don't wrap dialog in box

Browse source
This commit is contained in:
rolux 2015-02-12 09:44:47 +00:00
parent e533a13d52
commit 9fef3ccb67
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/UI/css/UI.css
View file

@ -533,6 +533,7 @@ Dialog
cursor: nwse-resize; cursor: nwse-resize;
} }
/*
.OxDialogBox { .OxDialogBox {
position: absolute; position: absolute;
left: 0; left: 0;
@ -541,6 +542,7 @@ Dialog
bottom: 0; bottom: 0;
overflow: hidden; overflow: hidden;
} }
*/
/* /*
================================================================================ ================================================================================

11
source/UI/js/Window/Dialog.js
View file

@ -83,9 +83,12 @@ Ox.Dialog = function(options, self) {
self.$layer = Ox.Layer({type: 'dialog'}); self.$layer = Ox.Layer({type: 'dialog'});
} }
/*
////
self.$box = $('<div>') self.$box = $('<div>')
.addClass('OxDialogBox') .addClass('OxDialogBox')
.css({zIndex: 11}); .css({zIndex: 11});
*/
self.$titlebar = Ox.Bar({ self.$titlebar = Ox.Bar({
size: 24 size: 24
@ -244,7 +247,7 @@ Ox.Dialog = function(options, self) {
y: event.clientY y: event.clientY
}; };
decenter(); decenter();
that.wrap(self.$box); //// that.wrap(self.$box);
} }
} }
@ -267,7 +270,7 @@ Ox.Dialog = function(options, self) {
function dragend(event) { function dragend(event) {
if (!$(event.target).is('.OxButton')) { if (!$(event.target).is('.OxButton')) {
Ox.$body.removeClass('OxDragging'); Ox.$body.removeClass('OxDragging');
that.unwrap(); //// that.unwrap();
} }
} }
@ -359,7 +362,7 @@ Ox.Dialog = function(options, self) {
self.$maximizeButton.toggle(); self.$maximizeButton.toggle();
self.maximized = false; self.maximized = false;
} }
that.wrap(self.$box); //// that.wrap(self.$box);
} }
function resize(event) { function resize(event) {
@ -528,7 +531,7 @@ Ox.Dialog = function(options, self) {
function resizeend() { function resizeend() {
Ox.$body.removeClass('OxDragging'); Ox.$body.removeClass('OxDragging');
that.unwrap(); //// that.unwrap();
that.triggerEvent('resizeend', { that.triggerEvent('resizeend', {
width: self.options.width, width: self.options.width,
height: self.options.height height: self.options.height