nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

made resizing sexier

Browse source
This commit is contained in:
Marius Nita 2002-11-15 05:01:37 +00:00
parent d55ede56a0
commit a3b2e7d905
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
otk/widget.cc
View file

@ -247,7 +247,9 @@ void OtkWidget::adjustHorz(void)
for (it = _children.begin(); it != end; ++it) { for (it = _children.begin(); it != end; ++it) {
tmp = *it; tmp = *it;
if (tmp->isStretchableHorz() && _fixed_width) if (tmp->isStretchableVert())
tmp->setHeight(_rect.height() - _bevel_width * 2);
if (tmp->isStretchableHorz())
stretchable.push_back(tmp); stretchable.push_back(tmp);
else else
width += tmp->_rect.width() + _bevel_width; width += tmp->_rect.width() + _bevel_width;
@ -262,10 +264,8 @@ void OtkWidget::adjustHorz(void)
int str_width = _rect.width() - width / stretchable.size(); int str_width = _rect.width() - width / stretchable.size();
for (; str_it != str_end; ++str_it) { for (; str_it != str_end; ++str_it)
(*str_it)->setWidth(str_width - _bevel_width); (*str_it)->setWidth(str_width - _bevel_width);
//(*str_it)->update();
}
} }
OtkWidget *prev_widget = 0; OtkWidget *prev_widget = 0;
@ -302,7 +302,9 @@ void OtkWidget::adjustVert(void)
for (it = _children.begin(); it != end; ++it) { for (it = _children.begin(); it != end; ++it) {
tmp = *it; tmp = *it;
if (tmp->isStretchableVert() && _fixed_height) if (tmp->isStretchableHorz())
tmp->setWidth(_rect.width() - _bevel_width * 2);
if (tmp->isStretchableVert())
stretchable.push_back(tmp); stretchable.push_back(tmp);
else else
height += tmp->_rect.height() + _bevel_width; height += tmp->_rect.height() + _bevel_width;
@ -317,10 +319,8 @@ void OtkWidget::adjustVert(void)
int str_height = _rect.height() - height / stretchable.size(); int str_height = _rect.height() - height / stretchable.size();
for (; str_it != str_end; ++str_it) { for (; str_it != str_end; ++str_it)
(*str_it)->setHeight(str_height - _bevel_width); (*str_it)->setHeight(str_height - _bevel_width);
//(*str_it)->update();
}
} }
OtkWidget *prev_widget = 0; OtkWidget *prev_widget = 0;
@ -416,7 +416,7 @@ bool OtkWidget::configure(const XConfigureEvent &e)
std::cout << "configure\n"; std::cout << "configure\n";
if (!(e.width == _rect.width() && e.height == _rect.height())) if (!(e.width == _rect.width() && e.height == _rect.height()))
_dirty = true; _dirty = true;
_rect.setRect(e.x, e.y, e.width, e.height); _rect.setRect(_rect.x(), _rect.y(), e.width, e.height);
update(); update();
} }
return true; return true;