// changing its gravity
if (frame && _gravity != oldgravity) {
// move our idea of the client's position based on its new gravity
- int x, y;
+ int x = frame->rect().x(), y = frame->rect().y();
frame->frameGravity(x, y);
_area.setPos(x, y);
}
w -= _base_size.x();
h -= _base_size.y();
- // for interactive resizing. have to move half an increment in each
- // direction.
- w += _size_inc.x() / 2;
- h += _size_inc.y() / 2;
-
if (user) {
+ // for interactive resizing. have to move half an increment in each
+ // direction.
+ int mw = w % _size_inc.x(); // how far we are towards the next size inc
+ int mh = h % _size_inc.y();
+ int aw = _size_inc.x() / 2; // amount to add
+ int ah = _size_inc.y() / 2;
+ // don't let us move into a new size increment
+ if (mw + aw >= _size_inc.x()) aw = _size_inc.x() - mw - 1;
+ if (mh + ah >= _size_inc.y()) ah = _size_inc.y() - mh - 1;
+ w += aw;
+ h += ah;
+
// if this is a user-requested resize, then check against min/max sizes
// and aspect ratios
void Client::move(int x, int y)
{
if (!(_functions & Func_Move)) return;
+ frame->frameGravity(x, y); // get the client's position based on x,y for the
+ // frame
internal_move(x, y);
}
}
+void Client::remaximize()
+{
+ int dir;
+ if (_max_horz && _max_vert)
+ dir = 0;
+ else if (_max_horz)
+ dir = 1;
+ else if (_max_vert)
+ dir = 2;
+ else
+ return; // not maximized
+ _max_horz = _max_vert = false;
+ maximize(true, dir, false);
+}
+
+
void Client::applyStartupState()
{
// these are in a carefully crafted order..
if (dir == 2 && !_max_vert) return;
}
- int g = _gravity;
-
const otk::Rect &a = openbox->screen(_screen)->area();
- int x = _area.x(), y = _area.y(), w = _area.width(), h = _area.height();
+ int x = frame->rect().x(), y = frame->rect().y(),
+ w = _area.width(), h = _area.height();
if (max) {
- // when maximizing, put the client where we want, NOT the frame!
- _gravity = StaticGravity;
- // adjust our idea of position based on StaticGravity, so we stay put
- // unless asked
- frame->frameGravity(x, y);
-
if (savearea) {
long dimensions[4];
long *readdim;
w = a.width();
}
if (dir == 0 || dir == 2) { // vert
- y = a.y() + frame->size().top;
+ y = a.y();
h = a.height() - frame->size().top - frame->size().bottom;
}
-
- printf("dir %d x %d y %d w %d h %d\n", dir, x, y, w, h);
} else {
long *dimensions;
long unsigned n = 4;
h = a.height() / 2;
}
}
- otk::Property::erase(_window, otk::Property::atoms.openbox_premax);
}
if (dir == 0 || dir == 1) // horz
_max_horz = max;
if (dir == 0 || dir == 2) // vert
_max_vert = max;
+
+ if (!_max_horz && !_max_vert)
+ otk::Property::erase(_window, otk::Property::atoms.openbox_premax);
+
changeState(); // change the state hints on the client
+ frame->frameGravity(x, y); // figure out where the client should be going
internal_resize(TopLeft, w, h, true, x, y);
- _gravity = g;
- if (max) {
- // because of my little gravity trick in here, we have to set the position
- // of the client to what it really is
- int x, y;
- frame->frameGravity(x, y);
- _area.setPos(x, y);
- }
}