From c11a4e74fe902c4f3385f542a79a0ebbda7a5b77 Mon Sep 17 00:00:00 2001 From: rolux Date: Thu, 23 Dec 2010 17:05:46 +0000 Subject: [PATCH] fixing timeline view window resize --- build/css/ox.ui.css | 15 +++++++++++++++ build/js/ox.ui.js | 19 +++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/build/css/ox.ui.css b/build/css/ox.ui.css index 81af27e..ef3f635 100644 --- a/build/css/ox.ui.css +++ b/build/css/ox.ui.css @@ -1124,6 +1124,21 @@ Panels margin: 1px 0 0 0; font-weight: bold; } +.OxCollapsePanel > .OxBar > .OxSelect { + position: absolute; + right: 0px; + width: 14px; + height: 16px; + border-width: 0 0 0 1px; + background: rgba(0, 0, 0, 0); + font-size: 11px; + text-align: center; + cursor: pointer; + overflow: hidden; + -moz-border-radius: 0; + -webkit-border-radius: 0; +} + .OxCollapsePanel > .OxContent { position: relative; left: 0; diff --git a/build/js/ox.ui.js b/build/js/ox.ui.js index 74b8a21..6bf5a5f 100644 --- a/build/js/ox.ui.js +++ b/build/js/ox.ui.js @@ -4292,7 +4292,7 @@ requires return that; - } + }; Ox.FormElementGroup = function(options, self) { @@ -4346,7 +4346,7 @@ requires return that; - } + }; Ox.Picker = function(options, self) { @@ -8823,6 +8823,7 @@ requires that = new Ox.Panel({}, self) .defaults({ collapsed: false, + menu: [], size: 16, title: '' }) @@ -8849,6 +8850,17 @@ requires .addClass('OxTitle') .html(self.options.title/*.toUpperCase()*/) .appendTo($titlebar); + if (self.options.menu.length) { + that.$menu = new Ox.Select({ + id: self.options.id + 'Menu', + items: self.options.menu, + max: 0, + min: 0, + type: 'image' + }) + .bindEvent('click', clickMenu) + .appendTo($titlebar) + } that.$content = new Ox.Element() .addClass('OxContent') .appendTo(that); @@ -8858,6 +8870,9 @@ requires that.$content.css({ marginTop: -that.$content.height() + 'px' }); + } + function clickMenu() { + } function dblclickTitlebar(e) { if (!$(e.target).hasClass('OxButton')) {