static void set_theme_statics(ObFrame *self);
static void free_theme_statics(ObFrame *self);
static gboolean frame_animate_iconify(gpointer self);
+static void frame_adjust_cursors(ObFrame *self);
static Window createWindow(Window parent, Visual *visual,
gulong mask, XSetWindowAttributes *attrib)
oldsize = self->size;
if (resized) {
+ /* do this before changing the frame's status like max_horz max_vert */
+ frame_adjust_cursors(self);
+
+ self->functions = self->client->functions;
self->decorations = self->client->decorations;
+ self->max_horz = self->client->max_horz;
+ self->max_vert = self->client->max_vert;
if (self->decorations & OB_FRAME_DECOR_BORDER) {
self->bwidth = ob_rr_theme->fbwidth;
}
self->rbwidth = self->bwidth;
- self->max_horz = self->client->max_horz;
- self->max_vert = self->client->max_vert;
-
if (self->max_horz) {
self->cbwidth_x = 0;
self->width = self->client->area.width - self->bwidth * 2;
XMoveResizeWindow(ob_display, self->titletop,
ob_rr_theme->grip_width + self->bwidth, 0,
/* width + bwidth*2 - bwidth*2 - grips*2 */
- self->width + ob_rr_theme->grip_width * 2,
+ self->width - ob_rr_theme->grip_width * 2,
self->bwidth);
XMoveResizeWindow(ob_display, self->titletopleft,
0, 0,
XMoveResizeWindow(ob_display, self->topresize,
ob_rr_theme->grip_width + self->bwidth,
0,
- self->width - (ob_rr_theme->grip_width +
- self->bwidth) * 2,
+ self->width - ob_rr_theme->grip_width *2,
ob_rr_theme->paddingy + 1);
- XMoveWindow(ob_display, self->tltresize, 0, 0);
- XMoveWindow(ob_display, self->tllresize, 0, 0);
+ XMoveWindow(ob_display, self->tltresize, self->bwidth, 0);
+ XMoveWindow(ob_display, self->tllresize, self->bwidth, 0);
XMoveWindow(ob_display, self->trtresize,
- self->width - ob_rr_theme->grip_width, 0);
+ self->bwidth + self->width -
+ ob_rr_theme->grip_width, 0);
XMoveWindow(ob_display, self->trrresize,
- self->width - ob_rr_theme->paddingx - 1, 0);
+ self->bwidth + self->width -
+ ob_rr_theme->paddingx - 1, 0);
XMapWindow(ob_display, self->topresize);
XMapWindow(ob_display, self->tltresize);
if (resized && (self->decorations & OB_FRAME_DECOR_TITLEBAR))
XResizeWindow(ob_display, self->label, self->label_width,
ob_rr_theme->label_height);
+}
- /* set up cursors */
- if (!fake &&
- (self->functions & OB_CLIENT_FUNC_RESIZE) !=
- (self->client->functions & OB_CLIENT_FUNC_RESIZE))
+static void frame_adjust_cursors(ObFrame *self)
+{
+ if ((self->functions & OB_CLIENT_FUNC_RESIZE) !=
+ (self->client->functions & OB_CLIENT_FUNC_RESIZE) ||
+ ((self->max_horz && self->max_vert) !=
+ (self->client->max_horz && self->client->max_vert)))
{
- gboolean r = self->client->functions & OB_CLIENT_FUNC_RESIZE &&
- !(self->max_horz && self->max_vert);
+ gboolean r = (self->client->functions & OB_CLIENT_FUNC_RESIZE) &&
+ !(self->client->max_horz && self->client->max_vert);
XSetWindowAttributes a;
a.cursor = ob_cursor(r ? OB_CURSOR_NORTH : OB_CURSOR_NONE);
XChangeWindowAttributes(ob_display, self->rgripright, CWCursor, &a);
XChangeWindowAttributes(ob_display, self->rgriptop, CWCursor, &a);
XChangeWindowAttributes(ob_display, self->rgripbottom, CWCursor, &a);
-
- self->functions = self->client->functions;
}
}
is fully maximized, then treat it like they clicked in the
button that is there */
if (self->max_horz && self->max_vert &&
- (win == self->title ||
+ (win == self->title || win == self->titletop ||
win == self->titleleft || win == self->titletopleft ||
win == self->titleright || win == self->titletopright))
{
/* title is a border width in from the edge */
if (win == self->title)
fx += self->bwidth;
+ /* titletop is a bit to the right */
+ else if (win == self->titletop)
+ fx += ob_rr_theme->grip_width + self->bwidth;
/* titletopright is way to the right edge */
else if (win == self->titletopright)
fx += self->area.width - (ob_rr_theme->grip_width + self->bwidth);
return self->rightmost;
}
}
+
+ /* there is no resizing maximized windows so make them the titlebar
+ context */
+ return OB_FRAME_CONTEXT_TITLEBAR;
}
if (win == self->window) return OB_FRAME_CONTEXT_FRAME;