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

from icccm:

Browse source 
If a base size is not provided, the minimum size is to be used in its place and vice versa.

Added support for this.
This commit is contained in:
Dana Jansens 2003-06-08 21:21:23 +00:00
parent ac4e6784dd
commit bda9e6aaf9
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
openbox/client.c
View file

@ -1601,6 +1601,7 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h,
gboolean user, gboolean final) gboolean user, gboolean final)
{ {
gboolean moved = FALSE, resized = FALSE; gboolean moved = FALSE, resized = FALSE;
int basew, baseh, minw, minh;
/* gets the frame's position */ /* gets the frame's position */
frame_client_gravity(self->frame, &x, &y); frame_client_gravity(self->frame, &x, &y);
@ -1657,9 +1658,25 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h,
} }
} }
/* find the base and min sizes */
if (self->base_size.width || self->base_size.height) {
basew = self->base_size.width;
baseh = self->base_size.height;
} else {
basew = self->min_size.width;
baseh = self->min_size.height;
}
if (self->min_size.width || self->min_size.height) {
minw = self->min_size.width;
minh = self->min_size.height;
} else {
minw = self->base_size.width;
minh = self->base_size.height;
}
if (!(w == self->area.width && h == self->area.height)) { if (!(w == self->area.width && h == self->area.height)) {
w -= self->base_size.width; w -= basew;
h -= self->base_size.height; h -= baseh;
if (user) { if (user) {
/* for interactive resizing. have to move half an increment in each /* for interactive resizing. have to move half an increment in each
@ -1684,9 +1701,9 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h,
/* smaller than min size or bigger than max size? */ /* smaller than min size or bigger than max size? */
if (w > self->max_size.width) w = self->max_size.width; if (w > self->max_size.width) w = self->max_size.width;
if (w < self->min_size.width) w = self->min_size.width; if (w < minw) w = minw;
if (h > self->max_size.height) h = self->max_size.height; if (h > self->max_size.height) h = self->max_size.height;
if (h < self->min_size.height) h = self->min_size.height; if (h < minh) h = minh;
/* adjust the height ot match the width for the aspect ratios */ /* adjust the height ot match the width for the aspect ratios */
if (self->min_ratio) if (self->min_ratio)
@ -1709,8 +1726,8 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h,
w *= self->size_inc.width; w *= self->size_inc.width;
h *= self->size_inc.height; h *= self->size_inc.height;
w += self->base_size.width; w += basew;
h += self->base_size.height; h += baseh;
} }
switch (anchor) { switch (anchor) {